3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 16:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zip file output dialog and status indication for sla in the statusbar.

Browse source
This commit is contained in:
tamasmeszaros 2018-11-13 11:53:54 +01:00
parent 90c38daeae
commit 95419370e1
6 changed files with 104 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/libslic3r/SLAPrint.cpp
View file

@ -154,6 +154,7 @@ void SLAPrint::process()
};
using slaposFn = std::function<void(const SLAPrintObject&)>;
using slapsFn = std::function<void(void)>;
std::array<SLAPrintObjectStep, slaposCount> objectsteps = {
slaposObjectSlice,
@ -164,7 +165,7 @@ void SLAPrint::process()
slaposSliceSupports
};
std::array<slaposFn, slaposCount> fullprogram =
std::array<slaposFn, slaposCount> pobj_program =
{
slice_model,
[](const SLAPrintObject&){}, // slaposSupportIslands now empty
@ -174,8 +175,14 @@ void SLAPrint::process()
slice_supports
};
std::array<slapsFn, slapsCount> print_program =
{
rasterize,
[](){} // validate
};
for(SLAPrintObject * po : m_objects) {
for(size_t s = 0; s < fullprogram.size(); ++s) {
for(size_t s = 0; s < pobj_program.size(); ++s) {
auto currentstep = objectsteps[s];
// Cancellation checking. Each step will check for cancellation
@ -188,11 +195,33 @@ void SLAPrint::process()
OBJ_STEP_LABELS[currentstep]);
po->set_started(currentstep);
fullprogram[s](*po);
pobj_program[s](*po);
po->set_done(currentstep);
}
}
}
std::array<SLAPrintStep, slapsCount> printsteps = {
slapsRasterize, slapsValidate
};
for(size_t s = 0; s < print_program.size(); ++s) {
auto currentstep = printsteps[s];
throw_if_canceled();
if(m_stepmask[s]) {
set_status(PRINT_STEP_LEVELS[currentstep],
PRINT_STEP_LABELS[currentstep]);
set_started(currentstep);
print_program[s]();
set_done(currentstep);
}
}
// If everything vent well
set_status(100, L("Slicing done"));
}
void SLAPrint::render_supports(SLASupportRenderer &renderer)
@ -200,6 +229,11 @@ void SLAPrint::render_supports(SLASupportRenderer &renderer)
std::cout << "Would show the SLA supports" << std::endl;
}
void SLAPrint::export_raster(const std::string &fname)
{
std::cout << "Would export the SLA raster" << std::endl;
}
SLAPrintObject::SLAPrintObject(SLAPrint *print, ModelObject *model_object):
Inherited(print),
m_model_object(model_object),