Switch to current SLA profile if an imported archive doesn't contain it.
Send a warning notification if this happens. Also,if there is no current SLA profile initialized, an error message will tell the user to switch to an SLA profile before importing. fixes #6915
This commit is contained in:
parent
33eba4aea6
commit
4d2bf8db0d
@ -203,7 +203,7 @@ RasterParams get_raster_params(const DynamicPrintConfig &cfg)
|
|||||||
|
|
||||||
if (!opt_disp_cols || !opt_disp_rows || !opt_disp_w || !opt_disp_h ||
|
if (!opt_disp_cols || !opt_disp_rows || !opt_disp_w || !opt_disp_h ||
|
||||||
!opt_mirror_x || !opt_mirror_y || !opt_orient)
|
!opt_mirror_x || !opt_mirror_y || !opt_orient)
|
||||||
throw Slic3r::FileIOError("Invalid SL1 / SL1S file");
|
throw MissingProfileError("Invalid SL1 / SL1S file");
|
||||||
|
|
||||||
RasterParams rstp;
|
RasterParams rstp;
|
||||||
|
|
||||||
@ -229,7 +229,7 @@ SliceParams get_slice_params(const DynamicPrintConfig &cfg)
|
|||||||
auto *opt_init_layerh = cfg.option<ConfigOptionFloat>("initial_layer_height");
|
auto *opt_init_layerh = cfg.option<ConfigOptionFloat>("initial_layer_height");
|
||||||
|
|
||||||
if (!opt_layerh || !opt_init_layerh)
|
if (!opt_layerh || !opt_init_layerh)
|
||||||
throw Slic3r::FileIOError("Invalid SL1 / SL1S file");
|
throw MissingProfileError("Invalid SL1 / SL1S file");
|
||||||
|
|
||||||
return SliceParams{opt_layerh->getFloat(), opt_init_layerh->getFloat()};
|
return SliceParams{opt_layerh->getFloat(), opt_init_layerh->getFloat()};
|
||||||
}
|
}
|
||||||
@ -293,24 +293,34 @@ ConfigSubstitutions import_sla_archive(const std::string &zipfname, DynamicPrint
|
|||||||
return out.load(arch.profile, ForwardCompatibilitySubstitutionRule::Enable);
|
return out.load(arch.profile, ForwardCompatibilitySubstitutionRule::Enable);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If the profile is missing from the archive (older PS versions did not have
|
||||||
|
// it), profile_out's initial value will be used as fallback. profile_out will be empty on
|
||||||
|
// function return if the archive did not contain any profile.
|
||||||
ConfigSubstitutions import_sla_archive(
|
ConfigSubstitutions import_sla_archive(
|
||||||
const std::string & zipfname,
|
const std::string & zipfname,
|
||||||
Vec2i windowsize,
|
Vec2i windowsize,
|
||||||
indexed_triangle_set & out,
|
indexed_triangle_set & out,
|
||||||
DynamicPrintConfig & profile,
|
DynamicPrintConfig & profile_out,
|
||||||
std::function<bool(int)> progr)
|
std::function<bool(int)> progr)
|
||||||
{
|
{
|
||||||
// Ensure minimum window size for marching squares
|
// Ensure minimum window size for marching squares
|
||||||
windowsize.x() = std::max(2, windowsize.x());
|
windowsize.x() = std::max(2, windowsize.x());
|
||||||
windowsize.y() = std::max(2, windowsize.y());
|
windowsize.y() = std::max(2, windowsize.y());
|
||||||
|
|
||||||
ArchiveData arch = extract_sla_archive(zipfname, "thumbnail");
|
std::string exclude_entries{"thumbnail"};
|
||||||
ConfigSubstitutions config_substitutions = profile.load(arch.profile, ForwardCompatibilitySubstitutionRule::Enable);
|
ArchiveData arch = extract_sla_archive(zipfname, exclude_entries);
|
||||||
|
DynamicPrintConfig profile_in, profile_use;
|
||||||
|
ConfigSubstitutions config_substitutions = profile_in.load(arch.profile, ForwardCompatibilitySubstitutionRule::Enable);
|
||||||
|
|
||||||
RasterParams rstp = get_raster_params(profile);
|
// If the archive contains an empty profile, use the one that was passed as output argument
|
||||||
|
// then replace it with the readed profile to report that it was empty.
|
||||||
|
profile_use = profile_in.empty() ? profile_out : profile_in;
|
||||||
|
profile_out = profile_in;
|
||||||
|
|
||||||
|
RasterParams rstp = get_raster_params(profile_use);
|
||||||
rstp.win = {windowsize.y(), windowsize.x()};
|
rstp.win = {windowsize.y(), windowsize.x()};
|
||||||
|
|
||||||
SliceParams slicp = get_slice_params(profile);
|
SliceParams slicp = get_slice_params(profile_use);
|
||||||
|
|
||||||
std::vector<ExPolygons> slices =
|
std::vector<ExPolygons> slices =
|
||||||
extract_slices_from_sla_archive(arch, rstp, progr);
|
extract_slices_from_sla_archive(arch, rstp, progr);
|
||||||
|
@ -57,6 +57,8 @@ inline ConfigSubstitutions import_sla_archive(
|
|||||||
return import_sla_archive(zipfname, windowsize, out, profile, progr);
|
return import_sla_archive(zipfname, windowsize, out, profile, progr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class MissingProfileError : public RuntimeError { using RuntimeError::RuntimeError; };
|
||||||
|
|
||||||
} // namespace Slic3r::sla
|
} // namespace Slic3r::sla
|
||||||
|
|
||||||
#endif // ARCHIVETRAITS_HPP
|
#endif // ARCHIVETRAITS_HPP
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
#include "slic3r/GUI/GUI_App.hpp"
|
#include "slic3r/GUI/GUI_App.hpp"
|
||||||
#include "slic3r/GUI/Plater.hpp"
|
#include "slic3r/GUI/Plater.hpp"
|
||||||
#include "slic3r/GUI/GUI_ObjectList.hpp"
|
#include "slic3r/GUI/GUI_ObjectList.hpp"
|
||||||
|
#include "slic3r/GUI/NotificationManager.hpp"
|
||||||
|
|
||||||
#include "libslic3r/Model.hpp"
|
#include "libslic3r/Model.hpp"
|
||||||
#include "libslic3r/PresetBundle.hpp"
|
#include "libslic3r/PresetBundle.hpp"
|
||||||
@ -144,16 +145,16 @@ void SLAImportJob::process()
|
|||||||
try {
|
try {
|
||||||
switch (p->sel) {
|
switch (p->sel) {
|
||||||
case Sel::modelAndProfile:
|
case Sel::modelAndProfile:
|
||||||
p->config_substitutions = import_sla_archive(path, p->win, p->mesh, p->profile, progr);
|
|
||||||
break;
|
|
||||||
case Sel::modelOnly:
|
case Sel::modelOnly:
|
||||||
p->config_substitutions = import_sla_archive(path, p->win, p->mesh, progr);
|
p->config_substitutions = import_sla_archive(path, p->win, p->mesh, p->profile, progr);
|
||||||
break;
|
break;
|
||||||
case Sel::profileOnly:
|
case Sel::profileOnly:
|
||||||
p->config_substitutions = import_sla_archive(path, p->profile);
|
p->config_substitutions = import_sla_archive(path, p->profile);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
} catch (MissingProfileError &) {
|
||||||
|
p->err = _L("The archive doesn't contain any profile data. Try to import after switching "
|
||||||
|
"to an SLA profile that can be used as fallback.").ToStdString();
|
||||||
} catch (std::exception &ex) {
|
} catch (std::exception &ex) {
|
||||||
p->err = ex.what();
|
p->err = ex.what();
|
||||||
}
|
}
|
||||||
@ -166,7 +167,7 @@ void SLAImportJob::reset()
|
|||||||
{
|
{
|
||||||
p->sel = Sel::modelAndProfile;
|
p->sel = Sel::modelAndProfile;
|
||||||
p->mesh = {};
|
p->mesh = {};
|
||||||
p->profile = {};
|
p->profile = m_plater->sla_print().full_print_config();
|
||||||
p->win = {2, 2};
|
p->win = {2, 2};
|
||||||
p->path.Clear();
|
p->path.Clear();
|
||||||
}
|
}
|
||||||
@ -202,7 +203,18 @@ void SLAImportJob::finalize()
|
|||||||
|
|
||||||
std::string name = wxFileName(p->path).GetName().ToUTF8().data();
|
std::string name = wxFileName(p->path).GetName().ToUTF8().data();
|
||||||
|
|
||||||
if (!p->profile.empty()) {
|
if (p->profile.empty()) {
|
||||||
|
m_plater->get_notification_manager()->push_notification(
|
||||||
|
NotificationType::CustomNotification,
|
||||||
|
NotificationManager::NotificationLevel::WarningNotificationLevel,
|
||||||
|
_L("Loaded archive did not contain any profile data. "
|
||||||
|
"The current SLA profile was used as fallback.").ToStdString());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (p->sel != Sel::modelOnly) {
|
||||||
|
if (p->profile.empty())
|
||||||
|
p->profile = m_plater->sla_print().full_print_config();
|
||||||
|
|
||||||
const ModelObjectPtrs& objects = p->plater->model().objects;
|
const ModelObjectPtrs& objects = p->plater->model().objects;
|
||||||
for (auto object : objects)
|
for (auto object : objects)
|
||||||
if (object->volumes.size() > 1)
|
if (object->volumes.size() > 1)
|
||||||
|
Loading…
Reference in New Issue
Block a user