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

ENH:check 3mf files without gcode data

Browse source 
Change-Id: Ic056cd29d4bab8612701fd2291af5a14eb937bb7
This commit is contained in:
tao wang 2023-06-09 14:07:55 +08:00 committed by Lane.Wei
parent 304c3abfe9
commit b79ee23dd6
6 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/slic3r/GUI/MediaFilePanel.cpp
View file

@ -507,8 +507,16 @@ void MediaFilePanel::doAction(size_t index, int action)
return; return;
} }
auto &file = fs->GetFile(index); auto &file = fs->GetFile(index);
Slic3r::GUI::wxGetApp().plater()->update_print_required_data(config, model, plate_data_list, from_u8(file.name).ToStdString()); int gcode_file_count = Slic3r::GUI::wxGetApp().plater()->update_print_required_data(config, model, plate_data_list, from_u8(file.name).ToStdString());
wxPostEvent(Slic3r::GUI::wxGetApp().plater(), SimpleEvent(EVT_PRINT_FROM_SDCARD_VIEW));
if (gcode_file_count > 0) {
wxPostEvent(Slic3r::GUI::wxGetApp().plater(), SimpleEvent(EVT_PRINT_FROM_SDCARD_VIEW));
}
else {
MessageDialog dlg(this, _L("The .gcode.3mf file contains no G-code data.Please slice it whthBambu Studio and export a new .gcode.3mf file."), wxEmptyString, wxICON_WARNING | wxOK);
auto res = dlg.ShowModal();
}
}); });
return; return;
} }

2
src/slic3r/GUI/MsgDialog.cpp
View file

@ -312,7 +312,7 @@ static void add_msg_content(wxWindow* parent, wxBoxSizer* content_sizer, wxStrin
// Code formatting will be preserved. This is useful for reporting errors from the placeholder parser. // Code formatting will be preserved. This is useful for reporting errors from the placeholder parser.
msg_escaped = std::string("<pre><code>") + msg_escaped + "</code></pre>"; msg_escaped = std::string("<pre><code>") + msg_escaped + "</code></pre>";
html->SetPage("<html><body bgcolor=\"" + bgr_clr_str + "\"><font color=\"" + text_clr_str + "\">" + wxString::FromUTF8(msg_escaped.data()) + "</font></body></html>"); html->SetPage("<html><body bgcolor=\"" + bgr_clr_str + "\"><font color=\"" + text_clr_str + "\">" + wxString::FromUTF8(msg_escaped.data()) + "</font></body></html>");
content_sizer->Add(html, 1, wxEXPAND|wxRIGHT,12); content_sizer->Add(html, 1, wxEXPAND|wxRIGHT, 8);
wxGetApp().UpdateDarkUIWin(html); wxGetApp().UpdateDarkUIWin(html);
} }

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

@ -2206,7 +2206,7 @@ struct Plater::priv
//BBS: add popup object table logic //BBS: add popup object table logic
bool PopupObjectTable(int object_id, int volume_id, const wxPoint& position); bool PopupObjectTable(int object_id, int volume_id, const wxPoint& position);
void on_action_send_to_printer(bool isall = false); void on_action_send_to_printer(bool isall = false);
void update_print_required_data(Slic3r::DynamicPrintConfig config, Slic3r::Model model, Slic3r::PlateDataPtrs plate_data_list, std::string file_name); int update_print_required_data(Slic3r::DynamicPrintConfig config, Slic3r::Model model, Slic3r::PlateDataPtrs plate_data_list, std::string file_name);
private: private:
bool layers_height_allowed() const; bool layers_height_allowed() const;
@ -6239,10 +6239,10 @@ void Plater::priv::on_action_print_plate_from_sdcard(SimpleEvent&)
m_select_machine_dlg->ShowModal(); m_select_machine_dlg->ShowModal();
} }
void Plater::priv::update_print_required_data(Slic3r::DynamicPrintConfig config, Slic3r::Model model, Slic3r::PlateDataPtrs plate_data_list, std::string file_name) int Plater::priv::update_print_required_data(Slic3r::DynamicPrintConfig config, Slic3r::Model model, Slic3r::PlateDataPtrs plate_data_list, std::string file_name)
{ {
if (!m_select_machine_dlg) m_select_machine_dlg = new SelectMachineDialog(q); if (!m_select_machine_dlg) m_select_machine_dlg = new SelectMachineDialog(q);
m_select_machine_dlg->update_print_required_data(config, model, plate_data_list, file_name); return m_select_machine_dlg->update_print_required_data(config, model, plate_data_list, file_name);
} }
void Plater::priv::on_action_send_to_printer(bool isall) void Plater::priv::on_action_send_to_printer(bool isall)
@ -10423,9 +10423,9 @@ bool Plater::undo_redo_string_getter(const bool is_undo, int idx, const char** o
return false; return false;
} }
void Plater::update_print_required_data(Slic3r::DynamicPrintConfig config, Slic3r::Model model, Slic3r::PlateDataPtrs plate_data_list, std::string file_name) int Plater::update_print_required_data(Slic3r::DynamicPrintConfig config, Slic3r::Model model, Slic3r::PlateDataPtrs plate_data_list, std::string file_name)
{ {
p->update_print_required_data(config, model, plate_data_list, file_name); return p->update_print_required_data(config, model, plate_data_list, file_name);
} }

2
src/slic3r/GUI/Plater.hpp
View file

@ -375,7 +375,7 @@ public:
void redo_to(int selection); void redo_to(int selection);
bool undo_redo_string_getter(const bool is_undo, int idx, const char** out_text); bool undo_redo_string_getter(const bool is_undo, int idx, const char** out_text);
void undo_redo_topmost_string_getter(const bool is_undo, std::string& out_text); void undo_redo_topmost_string_getter(const bool is_undo, std::string& out_text);
void update_print_required_data(Slic3r::DynamicPrintConfig config, Slic3r::Model model, Slic3r::PlateDataPtrs plate_data_list, std::string file_name); int update_print_required_data(Slic3r::DynamicPrintConfig config, Slic3r::Model model, Slic3r::PlateDataPtrs plate_data_list, std::string file_name);
bool search_string_getter(int idx, const char** label, const char** tooltip); bool search_string_getter(int idx, const char** label, const char** tooltip);
// For the memory statistics. // For the memory statistics.
const Slic3r::UndoRedo::Stack& undo_redo_stack_main() const; const Slic3r::UndoRedo::Stack& undo_redo_stack_main() const;

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

@ -2685,7 +2685,7 @@ bool SelectMachineDialog::is_timeout()
return false; return false;
} }
void SelectMachineDialog::update_print_required_data(Slic3r::DynamicPrintConfig config, Slic3r::Model model, Slic3r::PlateDataPtrs plate_data_list, std::string file_name) int SelectMachineDialog::update_print_required_data(Slic3r::DynamicPrintConfig config, Slic3r::Model model, Slic3r::PlateDataPtrs plate_data_list, std::string file_name)
{ {
m_required_data_plate_data_list.clear(); m_required_data_plate_data_list.clear();
m_required_data_config = config; m_required_data_config = config;
@ -2696,7 +2696,9 @@ void SelectMachineDialog::update_print_required_data(Slic3r::DynamicPrintConfig
m_required_data_plate_data_list.push_back(plate_data_list[i]); m_required_data_plate_data_list.push_back(plate_data_list[i]);
} }
} }
m_required_data_file_name = file_name; m_required_data_file_name = file_name;
return m_required_data_plate_data_list.size();
} }
void SelectMachineDialog::reset_timeout() void SelectMachineDialog::reset_timeout()

2
src/slic3r/GUI/SelectMachine.hpp
View file

@ -445,7 +445,7 @@ public:
bool is_same_printer_model(); bool is_same_printer_model();
bool has_tips(MachineObject* obj); bool has_tips(MachineObject* obj);
bool is_timeout(); bool is_timeout();
void update_print_required_data(Slic3r::DynamicPrintConfig config, Slic3r::Model model, Slic3r::PlateDataPtrs plate_data_list, std::string file_name); int update_print_required_data(Slic3r::DynamicPrintConfig config, Slic3r::Model model, Slic3r::PlateDataPtrs plate_data_list, std::string file_name);
void set_print_type(PrintFromType type) {m_print_type = type;}; void set_print_type(PrintFromType type) {m_print_type = type;};
bool Show(bool show); bool Show(bool show);
bool do_ams_mapping(MachineObject* obj_); bool do_ams_mapping(MachineObject* obj_);