Fixed a bug that would cause sending to fail

This commit is contained in:
sunsets
2024-04-01 15:10:24 +08:00
parent 3039c76417
commit 5183107d79
3 changed files with 8 additions and 4 deletions

View File

@@ -7978,7 +7978,7 @@ void Plater::send_gcode()
wxGetApp().preset_bundle->printers.get_edited_preset().config.opt_string("printer_notes"));
}
//B53
//B53 //B62
auto pppd = dlg.pppd();
auto checkbox_states = dlg.checkbox_states();
for (int i = 0; i < pppd.size(); i++) {
@@ -7987,7 +7987,7 @@ void Plater::send_gcode()
auto m_collection = &preset_bundle.printers;
auto preset_data = pppd[i];
Preset *preset = m_collection->find_preset((preset_data.name).ToStdString());
Preset *preset = m_collection->find_preset(preset_data.preset_name);
if (!preset || !preset->is_visible)
continue;
wxStringTokenizer tokenizer((preset_data.fullname), "*");

View File

@@ -81,8 +81,11 @@ PrintHostSendDialog::PrintHostSendDialog(const fs::path &path, PrintHostPostUplo
for (const std::string &preset_name : it->get_preset_names()) {
Preset *preset = wxGetApp().preset_bundle->printers.find_preset(preset_name);
if (preset != nullptr) {
//B62
preset_data.push_back({wxString::FromUTF8(it->get_full_name(preset_name)).Lower(), wxString::FromUTF8(preset_name),
wxString::FromUTF8(it->get_full_name(preset_name)), ph_printers.is_selected(it, preset_name)});
wxString::FromUTF8(it->get_full_name(preset_name)), ph_printers.is_selected(it, preset_name),
preset_name
});
}
}
}

View File

@@ -23,13 +23,14 @@ namespace Slic3r {
namespace GUI {
//B53
//B53 //B62
struct PhysicalPrinterPresetData
{
wxString lower_name; // just for sorting
wxString name; // preset_name
wxString fullname; // full name
bool selected; // is selected
std::string preset_name;
int checkboxId;
};
class PrintHostSendDialog : public GUI::MsgDialog