GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-15 21:15:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

debug print after pressing send gcode button on plater

Browse Source
This commit is contained in:
David Kocik 2022-01-10 11:02:44 +01:00
parent 5d7901c2f3
commit e0516a9872
2 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/slic3r/GUI/Plater.cpp
View File

@ -6072,24 +6072,28 @@ void Plater::reslice_SLA_until_step(SLAPrintObjectStep step, const ModelObject &
void Plater::send_gcode() void Plater::send_gcode()
{ {
BOOST_LOG_TRIVIAL(error) << " Plater::send_gcode 0";
// if physical_printer is selected, send gcode for this printer // if physical_printer is selected, send gcode for this printer
DynamicPrintConfig* physical_printer_config = wxGetApp().preset_bundle->physical_printers.get_selected_printer_config(); DynamicPrintConfig* physical_printer_config = wxGetApp().preset_bundle->physical_printers.get_selected_printer_config();
if (! physical_printer_config || p->model.objects.empty()) if (! physical_printer_config || p->model.objects.empty())
return; return;
BOOST_LOG_TRIVIAL(error) << " Plater::send_gcode 1";
PrintHostJob upload_job(physical_printer_config); PrintHostJob upload_job(physical_printer_config);
if (upload_job.empty()) if (upload_job.empty())
return; return;
BOOST_LOG_TRIVIAL(error) << " Plater::send_gcode 2";
// Obtain default output path // Obtain default output path
fs::path default_output_file; fs::path default_output_file;
try { try {
// Update the background processing, so that the placeholder parser will get the correct values for the ouput file template. // Update the background processing, so that the placeholder parser will get the correct values for the ouput file template.
// Also if there is something wrong with the current configuration, a pop-up dialog will be shown and the export will not be performed. // Also if there is something wrong with the current configuration, a pop-up dialog will be shown and the export will not be performed.
unsigned int state = this->p->update_restart_background_process(false, false); unsigned int state = this->p->update_restart_background_process(false, false);
BOOST_LOG_TRIVIAL(error) << " Plater::send_gcode 3";
if (state & priv::UPDATE_BACKGROUND_PROCESS_INVALID) if (state & priv::UPDATE_BACKGROUND_PROCESS_INVALID)
return; return;
BOOST_LOG_TRIVIAL(error) << " Plater::send_gcode 4";
default_output_file = this->p->background_process.output_filepath_for_project(into_path(get_project_filename(".3mf"))); default_output_file = this->p->background_process.output_filepath_for_project(into_path(get_project_filename(".3mf")));
BOOST_LOG_TRIVIAL(error) << " Plater::send_gcode 5 " << default_output_file;
} catch (const Slic3r::PlaceholderParserError& ex) { } catch (const Slic3r::PlaceholderParserError& ex) {
// Show the error with monospaced font. // Show the error with monospaced font.
show_error(this, ex.what(), true); show_error(this, ex.what(), true);
@ -6098,22 +6102,25 @@ void Plater::send_gcode()
show_error(this, ex.what(), false); show_error(this, ex.what(), false);
return; return;
} }
BOOST_LOG_TRIVIAL(error) << " Plater::send_gcode 6 " << default_output_file;
default_output_file = fs::path(Slic3r::fold_utf8_to_ascii(default_output_file.string())); default_output_file = fs::path(Slic3r::fold_utf8_to_ascii(default_output_file.string()));
BOOST_LOG_TRIVIAL(error) << " Plater::send_gcode 7 " << default_output_file;
// Repetier specific: Query the server for the list of file groups. // Repetier specific: Query the server for the list of file groups.
wxArrayString groups; wxArrayString groups;
{ {
wxBusyCursor wait; wxBusyCursor wait;
upload_job.printhost->get_groups(groups); upload_job.printhost->get_groups(groups);
} }
BOOST_LOG_TRIVIAL(error) << " Plater::send_gcode 7";
PrintHostSendDialog dlg(default_output_file, upload_job.printhost->get_post_upload_actions(), groups); PrintHostSendDialog dlg(default_output_file, upload_job.printhost->get_post_upload_actions(), groups);
if (dlg.ShowModal() == wxID_OK) { if (dlg.ShowModal() == wxID_OK) {
BOOST_LOG_TRIVIAL(error) << " Plater::send_gcode 8";
upload_job.upload_data.upload_path = dlg.filename(); upload_job.upload_data.upload_path = dlg.filename();
upload_job.upload_data.post_action = dlg.post_action(); upload_job.upload_data.post_action = dlg.post_action();
upload_job.upload_data.group = dlg.group(); upload_job.upload_data.group = dlg.group();
BOOST_LOG_TRIVIAL(error) << " Plater::send_gcode 9";
p->export_gcode(fs::path(), false, std::move(upload_job)); p->export_gcode(fs::path(), false, std::move(upload_job));
BOOST_LOG_TRIVIAL(error) << " Plater::send_gcode 10";
} }
} }

37
src/slic3r/GUI/PrintHostDialogs.cpp
View File

@ -45,80 +45,103 @@ PrintHostSendDialog::PrintHostSendDialog(const fs::path &path, PrintHostPostUplo
#ifdef __APPLE__ #ifdef __APPLE__
txt_filename->OSXDisableAllSmartSubstitutions(); txt_filename->OSXDisableAllSmartSubstitutions();
#endif #endif
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 0 " << path;
const AppConfig *app_config = wxGetApp().app_config; const AppConfig *app_config = wxGetApp().app_config;
auto *label_dir_hint = new wxStaticText(this, wxID_ANY, _L("Use forward slashes ( / ) as a directory separator if needed.")); auto *label_dir_hint = new wxStaticText(this, wxID_ANY, _L("Use forward slashes ( / ) as a directory separator if needed."));
label_dir_hint->Wrap(CONTENT_WIDTH * wxGetApp().em_unit()); label_dir_hint->Wrap(CONTENT_WIDTH * wxGetApp().em_unit());
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 1";
content_sizer->Add(txt_filename, 0, wxEXPAND); content_sizer->Add(txt_filename, 0, wxEXPAND);
content_sizer->Add(label_dir_hint); content_sizer->Add(label_dir_hint);
content_sizer->AddSpacer(VERT_SPACING); content_sizer->AddSpacer(VERT_SPACING);
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 2";
if (combo_groups != nullptr) { if (combo_groups != nullptr) {
// Repetier specific: Show a selection of file groups. // Repetier specific: Show a selection of file groups.
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 3";
auto *label_group = new wxStaticText(this, wxID_ANY, _L("Group")); auto *label_group = new wxStaticText(this, wxID_ANY, _L("Group"));
content_sizer->Add(label_group); content_sizer->Add(label_group);
content_sizer->Add(combo_groups, 0, wxBOTTOM, 2*VERT_SPACING); content_sizer->Add(combo_groups, 0, wxBOTTOM, 2*VERT_SPACING);
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 4";
wxString recent_group = from_u8(app_config->get("recent", CONFIG_KEY_GROUP)); wxString recent_group = from_u8(app_config->get("recent", CONFIG_KEY_GROUP));
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 5 "<< recent_group;
if (! recent_group.empty()) if (! recent_group.empty())
combo_groups->SetValue(recent_group); combo_groups->SetValue(recent_group);
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 6";
} }
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 7";
wxString recent_path = from_u8(app_config->get("recent", CONFIG_KEY_PATH)); wxString recent_path = from_u8(app_config->get("recent", CONFIG_KEY_PATH));
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 8 " << recent_path;
if (recent_path.Length() > 0 && recent_path[recent_path.Length() - 1] != '/') { if (recent_path.Length() > 0 && recent_path[recent_path.Length() - 1] != '/') {
recent_path += '/'; recent_path += '/';
} }
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 9 " << recent_path;
const auto recent_path_len = recent_path.Length(); const auto recent_path_len = recent_path.Length();
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 10 " << recent_path_len;
recent_path += path.filename().wstring(); recent_path += path.filename().wstring();
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 11 " << recent_path;
wxString stem(path.stem().wstring()); wxString stem(path.stem().wstring());
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 12 " << stem;
const auto stem_len = stem.Length(); const auto stem_len = stem.Length();
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 13 " << stem_len;
txt_filename->SetValue(recent_path); txt_filename->SetValue(recent_path);
txt_filename->SetFocus(); txt_filename->SetFocus();
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 14";
m_valid_suffix = recent_path.substr(recent_path.find_last_of('.')); m_valid_suffix = recent_path.substr(recent_path.find_last_of('.'));
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 15 " << m_valid_suffix;
// .gcode suffix control // .gcode suffix control
auto validate_path = [this](const wxString &path) -> bool { auto validate_path = [this](const wxString &path) -> bool {
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog validate_path 1";
if (! path.Lower().EndsWith(m_valid_suffix.Lower())) { if (! path.Lower().EndsWith(m_valid_suffix.Lower())) {
MessageDialog msg_wingow(this, wxString::Format(_L("Upload filename doesn't end with \"%s\". Do you wish to continue?"), m_valid_suffix), wxString(SLIC3R_APP_NAME), wxYES | wxNO); MessageDialog msg_wingow(this, wxString::Format(_L("Upload filename doesn't end with \"%s\". Do you wish to continue?"), m_valid_suffix), wxString(SLIC3R_APP_NAME), wxYES | wxNO);
if (msg_wingow.ShowModal() == wxID_NO) if (msg_wingow.ShowModal() == wxID_NO)
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog validate_path 2";
return false; return false;
} }
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog validate_path 3";
return true; return true;
}; };
if (post_actions.has(PrintHostPostUploadAction::StartPrint)) { if (post_actions.has(PrintHostPostUploadAction::StartPrint)) {
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 16";
auto* btn_print = add_button(wxID_YES, false, _L("Upload and Print")); auto* btn_print = add_button(wxID_YES, false, _L("Upload and Print"));
btn_print->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) { btn_print->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) {
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 17";
if (validate_path(txt_filename->GetValue())) { if (validate_path(txt_filename->GetValue())) {
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 18";
post_upload_action = PrintHostPostUploadAction::StartPrint; post_upload_action = PrintHostPostUploadAction::StartPrint;
EndDialog(wxID_OK); EndDialog(wxID_OK);
} }
}); });
} }
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 19";
if (post_actions.has(PrintHostPostUploadAction::StartSimulation)) { if (post_actions.has(PrintHostPostUploadAction::StartSimulation)) {
// Using wxID_MORE as a button identifier to be different from the other buttons, wxID_MORE has no other meaning here. // Using wxID_MORE as a button identifier to be different from the other buttons, wxID_MORE has no other meaning here.
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 20";
auto* btn_simulate = add_button(wxID_MORE, false, _L("Upload and Simulate")); auto* btn_simulate = add_button(wxID_MORE, false, _L("Upload and Simulate"));
btn_simulate->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) { btn_simulate->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) {
if (validate_path(txt_filename->GetValue())) { if (validate_path(txt_filename->GetValue())) {
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 21";
post_upload_action = PrintHostPostUploadAction::StartSimulation; post_upload_action = PrintHostPostUploadAction::StartSimulation;
EndDialog(wxID_OK); EndDialog(wxID_OK);
} }
}); });
} }
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 22";
add_button(wxID_CANCEL); add_button(wxID_CANCEL);
if (auto* btn_ok = get_button(wxID_OK); btn_ok != NULL) { if (auto* btn_ok = get_button(wxID_OK); btn_ok != NULL) {
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 23";
btn_ok->SetLabel(_L("Upload")); btn_ok->SetLabel(_L("Upload"));
btn_ok->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) { btn_ok->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) {
if (validate_path(txt_filename->GetValue())) { if (validate_path(txt_filename->GetValue())) {
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 24";
post_upload_action = PrintHostPostUploadAction::None; post_upload_action = PrintHostPostUploadAction::None;
EndDialog(wxID_OK); EndDialog(wxID_OK);
} }
}); });
} }
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog 25";
finalize(); finalize();
#ifdef __linux__ #ifdef __linux__
@ -136,7 +159,9 @@ PrintHostSendDialog::PrintHostSendDialog(const fs::path &path, PrintHostPostUplo
// Another similar case where the function only works with EVT_SHOW + CallAfter, // Another similar case where the function only works with EVT_SHOW + CallAfter,
// this time on Mac. // this time on Mac.
CallAfter([=]() { CallAfter([=]() {
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog wxEVT_SHOW 0 " << recent_path_len << " " << recent_path_len << " " << stem_len;
txt_filename->SetSelection(recent_path_len, recent_path_len + stem_len); txt_filename->SetSelection(recent_path_len, recent_path_len + stem_len);
BOOST_LOG_TRIVIAL(error) << "PrintHostSendDialog wxEVT_SHOW 1";
}); });
}); });
} }