mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-20 21:27:52 -06:00
ENH: CLI: optimize the logic for message
1. treat the critical slicing warnings as error 2. save more information into result including the triangle counts and the non-critical warnings JIRA: STUDIO-4217 Change-Id: I25b746d06c9a1ef2d642c67852577982a2986322 (cherry picked from commit 1d9707ed04cbb6dc12b440b70f3581c619136ac3)
This commit is contained in:
parent
82791b0320
commit
bf8ac4c436
4 changed files with 182 additions and 100 deletions
|
@ -110,11 +110,11 @@ void PrintBase::set_status(int percent, const std::string &message, unsigned in
|
|||
BOOST_LOG_TRIVIAL(debug) <<boost::format("Percent %1%: %2%\n")%percent %message.c_str();
|
||||
}
|
||||
|
||||
void PrintBase::status_update_warnings(int step, PrintStateBase::WarningLevel /* warning_level */,
|
||||
void PrintBase::status_update_warnings(int step, PrintStateBase::WarningLevel warning_level,
|
||||
const std::string &message, const PrintObjectBase* print_object, PrintStateBase::SlicingNotificationType message_id)
|
||||
{
|
||||
if (this->m_status_callback) {
|
||||
auto status = print_object ? SlicingStatus(*print_object, step, message, message_id) : SlicingStatus(*this, step, message, message_id);
|
||||
auto status = print_object ? SlicingStatus(*print_object, step, message, message_id, warning_level) : SlicingStatus(*this, step, message, message_id, warning_level);
|
||||
m_status_callback(status);
|
||||
}
|
||||
else if (! message.empty())
|
||||
|
@ -122,12 +122,12 @@ void PrintBase::status_update_warnings(int step, PrintStateBase::WarningLevel /*
|
|||
}
|
||||
|
||||
//BBS: add PrintObject id into slicing status
|
||||
void PrintBase::status_update_warnings(int step, PrintStateBase::WarningLevel /* warning_level */,
|
||||
void PrintBase::status_update_warnings(int step, PrintStateBase::WarningLevel warning_level,
|
||||
const std::string& message, PrintObjectBase &object, PrintStateBase::SlicingNotificationType message_id)
|
||||
{
|
||||
//BBS: add object it into slicing status
|
||||
if (this->m_status_callback) {
|
||||
m_status_callback(SlicingStatus(object, step, message, message_id));
|
||||
m_status_callback(SlicingStatus(object, step, message, message_id, warning_level));
|
||||
}
|
||||
else if (!message.empty())
|
||||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", PrintObject warning: %1%\n")% message.c_str();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue