diff --git a/resources/images/bed_cool.png b/resources/images/bed_cool.png new file mode 100644 index 000000000..3154344b5 Binary files /dev/null and b/resources/images/bed_cool.png differ diff --git a/resources/images/bed_cool_supertack.png b/resources/images/bed_cool_supertack.png new file mode 100644 index 000000000..10ec5e0b5 Binary files /dev/null and b/resources/images/bed_cool_supertack.png differ diff --git a/resources/images/bed_engineering.png b/resources/images/bed_engineering.png new file mode 100644 index 000000000..4b2a88c6d Binary files /dev/null and b/resources/images/bed_engineering.png differ diff --git a/resources/images/bed_high_templ.png b/resources/images/bed_high_templ.png new file mode 100644 index 000000000..7512b1d45 Binary files /dev/null and b/resources/images/bed_high_templ.png differ diff --git a/resources/images/bed_pei.png b/resources/images/bed_pei.png new file mode 100644 index 000000000..eff98a130 Binary files /dev/null and b/resources/images/bed_pei.png differ diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 8cfb9434c..4de4c05e2 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -319,8 +319,8 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) m_comboBox_printer = new ComboBox(printer_staticbox, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, 0, nullptr, wxCB_READONLY); m_comboBox_printer->SetBorderWidth(0); - m_comboBox_printer->SetMinSize(wxSize(FromDIP(260), FromDIP(60))); - m_comboBox_printer->SetMaxSize(wxSize(FromDIP(260), FromDIP(60))); + m_comboBox_printer->SetMinSize(wxSize(FromDIP(250), FromDIP(60))); + m_comboBox_printer->SetMaxSize(wxSize(FromDIP(250), FromDIP(60))); m_comboBox_printer->SetBackgroundColor(*wxWHITE); m_comboBox_printer->Bind(wxEVT_COMBOBOX, &SelectMachineDialog::on_selection_changed, this); @@ -345,15 +345,15 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) bed_staticbox->SetMaxSize(wxSize(FromDIP(98), FromDIP(68))); bed_staticbox->SetBorderColor(wxColour(0xCECECE)); - m_bed_image = new wxStaticBitmap(printer_staticbox, wxID_ANY, create_scaled_bitmap("printer_preview_BL-P001", this, 32)); - m_bed_image->SetBackgroundColour(*wxGREEN); + m_bed_image = new wxStaticBitmap(bed_staticbox, wxID_ANY, create_scaled_bitmap("bed_cool", this, 32)); + m_bed_image->SetBackgroundColour(*wxWHITE); m_bed_image->SetMinSize(wxSize(FromDIP(32), FromDIP(32))); m_bed_image->SetMaxSize(wxSize(FromDIP(32), FromDIP(32))); m_text_bed_type = new Label(bed_staticbox); m_text_bed_type->SetForegroundColour(0xCECECE); - m_text_bed_type->SetMaxSize(wxSize(FromDIP(80), 0)); - m_text_bed_type->SetFont(Label::Body_13); + m_text_bed_type->SetMaxSize(wxSize(FromDIP(80), FromDIP(24))); + m_text_bed_type->SetFont(Label::Body_10); sizer_bed_staticbox->Add(0, 0, 0, wxTOP, FromDIP(16)); sizer_bed_staticbox->Add(m_bed_image, 0, wxALIGN_CENTER, 0); @@ -4134,8 +4134,7 @@ bool SelectMachineDialog::Show(bool show) m_text_bed_type->Hide(); } else { - plate_name = "Plate: " + plate_name; - m_text_bed_type->SetLabelText(plate_name); + m_text_bed_type->SetLabelText(format_bed_name(plate_name)); m_text_bed_type->Show(); } @@ -4151,6 +4150,28 @@ bool SelectMachineDialog::Show(bool show) return DPIDialog::Show(show); } +wxString SelectMachineDialog::format_bed_name(std::string plate_name) +{ + wxString name; + if (plate_name == "Cool Plate") { + name = _L("Cool"); + m_bed_image->SetBitmap(create_scaled_bitmap("bed_cool", this, 32)); + } else if (plate_name == "Engineering Plate") { + name = _L("Engineering"); + m_bed_image->SetBitmap(create_scaled_bitmap("bed_engineering", this, 32)); + } else if (plate_name == "High Temp Plate") { + name = _L("High Temp"); + m_bed_image->SetBitmap(create_scaled_bitmap("bed_high_templ", this, 32)); + } else if (plate_name == "Textured PEI Plate") { + name = "PEI"; + m_bed_image->SetBitmap(create_scaled_bitmap("bed_pei", this, 32)); + } else if (plate_name == "Supertack Plate") { + name = _L("Cool(Supertack)"); + m_bed_image->SetBitmap(create_scaled_bitmap("bed_cool_supertack", this, 32)); + } + return name; +} + SelectMachineDialog::~SelectMachineDialog() { delete m_refresh_timer; diff --git a/src/slic3r/GUI/SelectMachine.hpp b/src/slic3r/GUI/SelectMachine.hpp index f6fa39484..47741eebb 100644 --- a/src/slic3r/GUI/SelectMachine.hpp +++ b/src/slic3r/GUI/SelectMachine.hpp @@ -429,7 +429,7 @@ public: int update_print_required_data(Slic3r::DynamicPrintConfig config, Slic3r::Model model, Slic3r::PlateDataPtrs plate_data_list, std::string file_name, std::string file_path); void set_print_type(PrintFromType type) {m_print_type = type;}; bool Show(bool show); - bool do_ams_mapping(MachineObject* obj_); + bool do_ams_mapping(MachineObject *obj_); bool get_ams_mapping_result(std::string& mapping_array_str, std::string& mapping_array_str2, std::string& ams_mapping_info); bool can_hybrid_mapping(ExtderData data); void auto_supply_with_ext(std::vector slots); @@ -438,6 +438,7 @@ public: std::string get_print_status_info(PrintDialogStatus status); PrintFromType get_print_type() {return m_print_type;}; + wxString format_bed_name(std::string plate_name); wxString format_steel_name(NozzleType type); wxString format_text(wxString &m_msg); PrintDialogStatus get_status() { return m_print_status; }