juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 19:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make tests happy

Browse Source
This commit is contained in:
Alessandro Ranellucci
2015-07-02 14:29:20 +02:00
parent 5571144c0e
commit b14290b9f6
10 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
xs/src/libslic3r/ExtrusionEntity.hpp
View File

@@ -13,6 +13,7 @@ class Extruder;
/* Each ExtrusionRole value identifies a distinct set of { extruder, speed } */
enum ExtrusionRole {
erNone,
erPerimeter,
erExternalPerimeter,
erOverhangPerimeter,

4
xs/src/libslic3r/GCode.cpp
View File

@@ -156,7 +156,7 @@ REGISTER_CLASS(Wipe, "GCode::Wipe");
GCode::GCode()
: enable_loop_clipping(true), enable_cooling_markers(false), layer_count(0),
layer_index(-1), first_layer(false), elapsed_time(0), volumetric_speed(0),
_last_pos_defined(false)
_last_pos_defined(false), layer(NULL), placeholder_parser(NULL)
{
}
@@ -224,7 +224,7 @@ GCode::needs_retraction(const Polyline &travel, ExtrusionRole role)
if (role == erSupportMaterial) {
SupportLayer* support_layer = dynamic_cast<SupportLayer*>(this->layer);
if (support_layer->support_islands.contains(travel)) {
if (support_layer != NULL && support_layer->support_islands.contains(travel)) {
// skip retraction if this is a travel move inside a support material island
return false;
}

2
xs/src/libslic3r/GCode.hpp
View File

@@ -87,7 +87,7 @@ class GCode {
void apply_print_config(const PrintConfig &print_config);
void set_origin(const Pointf &pointf);
std::string preamble();
bool needs_retraction(const Polyline &travel, ExtrusionRole role);
bool needs_retraction(const Polyline &travel, ExtrusionRole role = erNone);
std::string retract(bool toolchange = false);
std::string unretract();
Pointf point_to_gcode(const Point &point);

3
xs/xsp/ExtrusionLoop.xsp
View File

@@ -38,9 +38,8 @@ ExtrusionLoop::arrayref()
CODE:
AV* av = newAV();
av_fill(av, THIS->paths.size()-1);
int i = 0;
for (ExtrusionPaths::iterator it = THIS->paths.begin(); it != THIS->paths.end(); ++it) {
av_store(av, i++, perl_to_SV_ref(*it));
av_store(av, it - THIS->paths.begin(), perl_to_SV_ref(*it));
}
RETVAL = newRV_noinc((SV*)av);
OUTPUT:

1
xs/xsp/ExtrusionPath.xsp
View File

@@ -133,6 +133,7 @@ ExtrusionPath::subtract_expolygons(ExPolygonCollection* collection)
IV
_constant()
ALIAS:
EXTR_ROLE_NONE = erNone
EXTR_ROLE_PERIMETER = erPerimeter
EXTR_ROLE_EXTERNAL_PERIMETER = erExternalPerimeter
EXTR_ROLE_OVERHANG_PERIMETER = erOverhangPerimeter

2
xs/xsp/GCode.xsp
View File

@@ -152,7 +152,7 @@
void set_origin(Pointf* pointf)
%code{% THIS->set_origin(*pointf); %};
std::string preamble();
bool needs_retraction(Polyline* travel, ExtrusionRole role)
bool needs_retraction(Polyline* travel, ExtrusionRole role = erNone)
%code{% RETVAL = THIS->needs_retraction(*travel, role); %};
std::string retract(bool toolchange = false);
std::string unretract();