3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 12:11: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-07-21 12:28:14 +02:00
commit be9114c6c8
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/slic3r/GUI/Plater.cpp
View file

@ -3585,6 +3585,7 @@ void Plater::priv::fix_through_netfabb(const int obj_idx, const int vol_idx/* =
}
fix_model_by_win10_sdk_gui(*mo, vol_idx);
q->SetFocus();
sla::reproject_points_and_holes(mo);
this->update();
this->object_list_changed();

6
src/slic3r/Utils/FixModelByWin10.cpp
View file

@ -423,12 +423,10 @@ void fix_model_by_win10_sdk_gui(ModelObject &model_object, int volume_idx)
if (canceled) {
// Nothing to show.
} else if (success) {
//wxMessageDialog dlg(nullptr, _(L("Model repaired successfully")), _(L("Model Repair by the Netfabb service")), wxICON_INFORMATION | wxOK_DEFAULT);
Slic3r::GUI::MessageDialog dlg(nullptr, _(L("Model repaired successfully")), _(L("Model Repair by the Netfabb service")), wxICON_INFORMATION | wxOK_DEFAULT);
Slic3r::GUI::MessageDialog dlg(nullptr, _L("Model repaired successfully"), _L("Model Repair by the Netfabb service"), wxICON_INFORMATION | wxOK);
dlg.ShowModal();
} else {
//wxMessageDialog dlg(nullptr, _(L("Model repair failed:")) + " \n" + _(progress.message), _(L("Model Repair by the Netfabb service")), wxICON_ERROR | wxOK_DEFAULT);
Slic3r::GUI::MessageDialog dlg(nullptr, _(L("Model repair failed:")) + " \n" + _(progress.message), _(L("Model Repair by the Netfabb service")), wxICON_ERROR | wxOK_DEFAULT);
Slic3r::GUI::MessageDialog dlg(nullptr, _L("Model repair failed:") + " \n" + _(progress.message), _L("Model Repair by the Netfabb service"), wxICON_ERROR | wxOK);
dlg.ShowModal();
}
worker_thread.join();