pengo1998/OrcaSlicer-bambulab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature_slice_to_png

Browse Source
This commit is contained in:
tamasmeszaros
2018-07-18 10:14:15 +02:00
parent b82bc5feba 08529189c9
commit 9559ad77e5
121 changed files with 18093 additions and 3459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xs/src/libslic3r/Print.hpp
View File

@@ -24,6 +24,7 @@ class Print;
class PrintObject;
class ModelObject;
// Print step IDs for keeping track of the print state.
enum PrintStep {
psSkirt, psBrim, psWipeTower, psCount,
@@ -241,7 +242,8 @@ public:
// TODO: status_cb
ProgressIndicatorPtr progressindicator;
std::string estimated_print_time;
std::string estimated_normal_print_time;
std::string estimated_silent_print_time;
double total_used_filament, total_extruded_volume, total_cost, total_weight;
std::map<size_t, float> filament_stats;
PrintState<PrintStep, psCount> state;
@@ -291,6 +293,9 @@ public:
bool has_support_material() const;
void auto_assign_extruders(ModelObject* model_object) const;
// Returns extruder this eec should be printed with, according to PrintRegion config:
static int get_extruder(const ExtrusionEntityCollection& fill, const PrintRegion &region);
void _make_skirt();
void _make_brim();
@@ -329,6 +334,7 @@ private:
tbb::atomic<bool> m_canceled;
};
#define FOREACH_BASE(type, container, iterator) for (type::const_iterator iterator = (container).begin(); iterator != (container).end(); ++iterator)
#define FOREACH_REGION(print, region) FOREACH_BASE(PrintRegionPtrs, (print)->regions, region)
#define FOREACH_OBJECT(print, object) FOREACH_BASE(PrintObjectPtrs, (print)->objects, object)