amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
enricoturri1966 2020-07-10 10:22:36 +02:00
commit 74b26d2d2f
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/slic3r/GUI/GUI_App.cpp
View file

@ -633,9 +633,9 @@ void GUI_App::recreate_GUI(const wxString& msg_name)
{ {
mainframe->shutdown(); mainframe->shutdown();
wxProgressDialog dlg(msg_name, msg_name); wxProgressDialog dlg(msg_name, msg_name, 100, nullptr, wxPD_AUTO_HIDE);
dlg.Pulse(); dlg.Pulse();
dlg.Update(10, _(L("Recreating")) + dots); dlg.Update(10, _L("Recreating") + dots);
MainFrame *old_main_frame = mainframe; MainFrame *old_main_frame = mainframe;
mainframe = new MainFrame(); mainframe = new MainFrame();
@ -645,17 +645,17 @@ void GUI_App::recreate_GUI(const wxString& msg_name)
sidebar().obj_list()->init_objects(); sidebar().obj_list()->init_objects();
SetTopWindow(mainframe); SetTopWindow(mainframe);
dlg.Update(30, _(L("Recreating")) + dots); dlg.Update(30, _L("Recreating") + dots);
old_main_frame->Destroy(); old_main_frame->Destroy();
// For this moment ConfigWizard is deleted, invalidate it. // For this moment ConfigWizard is deleted, invalidate it.
m_wizard = nullptr; m_wizard = nullptr;
dlg.Update(80, _(L("Loading of current presets")) + dots); dlg.Update(80, _L("Loading of current presets") + dots);
m_printhost_job_queue.reset(new PrintHostJobQueue(mainframe->printhost_queue_dlg())); m_printhost_job_queue.reset(new PrintHostJobQueue(mainframe->printhost_queue_dlg()));
load_current_presets(); load_current_presets();
mainframe->Show(true); mainframe->Show(true);
dlg.Update(90, _(L("Loading of a mode view")) + dots); dlg.Update(90, _L("Loading of a mode view") + dots);
/* Temporary workaround for the correct behavior of the Scrolled sidebar panel: /* Temporary workaround for the correct behavior of the Scrolled sidebar panel:
* change min hight of object list to the normal min value (15 * wxGetApp().em_unit()) * change min hight of object list to the normal min value (15 * wxGetApp().em_unit())
* after first whole Mainframe updating/layouting * after first whole Mainframe updating/layouting

4
src/slic3r/GUI/MainFrame.cpp
View file

@ -1621,10 +1621,10 @@ void MainFrame::quick_slice(const int qs)
} }
// show processbar dialog // show processbar dialog
m_progress_dialog = new wxProgressDialog(_(L("Slicing")) + dots, m_progress_dialog = new wxProgressDialog(_L("Slicing") + dots,
// TRN "Processing input_file_basename" // TRN "Processing input_file_basename"
from_u8((boost::format(_utf8(L("Processing %s"))) % (input_file_basename + dots)).str()), from_u8((boost::format(_utf8(L("Processing %s"))) % (input_file_basename + dots)).str()),
100, this, 4); 100, nullptr, wxPD_AUTO_HIDE);
m_progress_dialog->Pulse(); m_progress_dialog->Pulse();
{ {
// my @warnings = (); // my @warnings = ();

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

@ -2248,17 +2248,17 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
} }
const auto loading = _L("Loading") + dots; const auto loading = _L("Loading") + dots;
wxProgressDialog dlg(loading, loading); wxProgressDialog dlg(loading, "", 100, q, wxPD_AUTO_HIDE);
dlg.Pulse(); dlg.Pulse();
auto *new_model = (!load_model || one_by_one) ? nullptr : new Slic3r::Model(); auto *new_model = (!load_model || one_by_one) ? nullptr : new Slic3r::Model();
std::vector<size_t> obj_idxs; std::vector<size_t> obj_idxs;
for (size_t i = 0; i < input_files.size(); i++) { for (size_t i = 0; i < input_files.size(); ++i) {
const auto &path = input_files[i]; const auto &path = input_files[i];
const auto filename = path.filename(); const auto filename = path.filename();
const auto dlg_info = format_wxstr(_L("Processing input file %s"), from_path(filename)) + "\n"; const auto dlg_info = _L("Loading file") + ": " + from_path(filename);
dlg.Update(100 * i / input_files.size(), dlg_info); dlg.Update(static_cast<int>(100.0f * static_cast<float>(i) / static_cast<float>(input_files.size())), dlg_info);
const bool type_3mf = std::regex_match(path.string(), pattern_3mf); const bool type_3mf = std::regex_match(path.string(), pattern_3mf);
const bool type_zip_amf = !type_3mf && std::regex_match(path.string(), pattern_zip_amf); const bool type_zip_amf = !type_3mf && std::regex_match(path.string(), pattern_zip_amf);

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

@ -337,8 +337,8 @@ void fix_model_by_win10_sdk_gui(ModelObject &model_object, int volume_idx)
// Open a progress dialog. // Open a progress dialog.
wxProgressDialog progress_dialog( wxProgressDialog progress_dialog(
_(L("Model fixing")), _L("Model fixing"),
_(L("Exporting model...")), _L("Exporting model") + "...",
100, nullptr, wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_CAN_ABORT); 100, nullptr, wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_CAN_ABORT);
// Executing the calculation in a background thread, so that the COM context could be created with its own threading model. // Executing the calculation in a background thread, so that the COM context could be created with its own threading model.
// (It seems like wxWidgets initialize the COM contex as single threaded and we need a multi-threaded context). // (It seems like wxWidgets initialize the COM contex as single threaded and we need a multi-threaded context).