3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-31 04:31:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer

Browse source
This commit is contained in:
enricoturri1966 2021-09-29 13:34:45 +02:00
commit 88c701888d
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libslic3r/SLAPrint.cpp
View file

@ -1047,15 +1047,15 @@ Vec3d SLAPrint::relative_correction() const
Vec3d corr(1., 1., 1.); Vec3d corr(1., 1., 1.);
if(printer_config().relative_correction.values.size() >= 2) { if(printer_config().relative_correction.values.size() >= 2) {
corr(X) = printer_config().relative_correction.values[0]; corr.x() = printer_config().relative_correction.values[0];
corr(Y) = printer_config().relative_correction.values[0]; corr.y() = corr.x();
corr(Z) = printer_config().relative_correction.values.back(); corr.z() = printer_config().relative_correction.values[1];
} }
if(material_config().material_correction.values.size() >= 2) { if(material_config().material_correction.values.size() >= 2) {
corr(X) *= material_config().material_correction.values[0]; corr.x() *= material_config().material_correction.values[0];
corr(Y) *= material_config().material_correction.values[0]; corr.y() = corr.x();
corr(Z) *= material_config().material_correction.values.back(); corr.z() *= material_config().material_correction.values[1];
} }
return corr; return corr;

6
src/slic3r/GUI/NotificationManager.cpp
View file

@ -1172,7 +1172,7 @@ void NotificationManager::SlicingProgressNotification::set_status_text(const std
{ {
NotificationData data{ NotificationType::SlicingProgress, NotificationLevel::ProgressBarNotificationLevel, 0, _u8L("Slicing finished."), m_is_fff ? _u8L("Export G-Code.") : _u8L("Export.") }; NotificationData data{ NotificationType::SlicingProgress, NotificationLevel::ProgressBarNotificationLevel, 0, _u8L("Slicing finished."), m_is_fff ? _u8L("Export G-Code.") : _u8L("Export.") };
update(data); update(data);
m_state = EState::NotFading; m_state = EState::Shown;
} }
break; break;
default: default:
@ -1191,7 +1191,7 @@ void NotificationManager::SlicingProgressNotification::set_print_info(const std:
void NotificationManager::SlicingProgressNotification::set_sidebar_collapsed(bool collapsed) void NotificationManager::SlicingProgressNotification::set_sidebar_collapsed(bool collapsed)
{ {
m_sidebar_collapsed = collapsed; m_sidebar_collapsed = collapsed;
if (m_sp_state == SlicingProgressState::SP_COMPLETED) if (m_sp_state == SlicingProgressState::SP_COMPLETED && collapsed)
m_state = EState::NotFading; m_state = EState::NotFading;
} }
@ -1208,7 +1208,7 @@ int NotificationManager::SlicingProgressNotification::get_duration()
if (m_sp_state == SlicingProgressState::SP_CANCELLED) if (m_sp_state == SlicingProgressState::SP_CANCELLED)
return 2; return 2;
else if (m_sp_state == SlicingProgressState::SP_COMPLETED && !m_sidebar_collapsed) else if (m_sp_state == SlicingProgressState::SP_COMPLETED && !m_sidebar_collapsed)
return 0; return 2;
else else
return 0; return 0;
} }