Fixed back-end warning infrastructure: The Print / PrintObject

should have been derived from ObjectBase, not from ObjectID.
This commit is contained in:
bubnikv 2020-07-21 15:33:28 +02:00
parent 6057fb9595
commit f7ceffb46e
5 changed files with 12 additions and 10 deletions

View file

@ -93,7 +93,7 @@ void PrintBase::status_update_warnings(ObjectID object_id, int step, PrintStateB
if (this->m_status_callback)
m_status_callback(SlicingStatus(*this, step));
else if (! message.empty())
printf("%s warning: %s\n", (object_id == ObjectID(*this)) ? "print" : "print object", message.c_str());
printf("%s warning: %s\n", (object_id == this->id()) ? "print" : "print object", message.c_str());
}
tbb::mutex& PrintObjectBase::state_mutex(PrintBase *print)
@ -108,7 +108,7 @@ std::function<void()> PrintObjectBase::cancel_callback(PrintBase *print)
void PrintObjectBase::status_update_warnings(PrintBase *print, int step, PrintStateBase::WarningLevel warning_level, const std::string &message)
{
print->status_update_warnings(*this, step, warning_level, message);
print->status_update_warnings(this->id(), step, warning_level, message);
}
} // namespace Slic3r