diff --git a/resources/images/air_pump.svg b/resources/images/air_pump.svg new file mode 100644 index 000000000..799588ec2 --- /dev/null +++ b/resources/images/air_pump.svg @@ -0,0 +1,396 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/printer_thumbnail_h2d.svg b/resources/images/printer_thumbnail_h2d.svg new file mode 100644 index 000000000..9108233af --- /dev/null +++ b/resources/images/printer_thumbnail_h2d.svg @@ -0,0 +1,531 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/printers/O1D.json b/resources/printers/O1D.json index 540e1632a..cd9460a90 100644 --- a/resources/printers/O1D.json +++ b/resources/printers/O1D.json @@ -45,7 +45,7 @@ "support_ai_monitoring": true, "support_first_layer_inspect": false, "support_chamber_temp_edit": true, - "support_chamber_temp_edit_range": [20, 65], + "support_chamber_temp_edit_range": [ 20, 65 ], "support_extrusion_cali": false, "support_user_preset": false }, @@ -53,7 +53,7 @@ "printer_modes": [ "fdm", "laser", "cut" ], "compatible_machine": [], "printer_type": "O1D", - "printer_thumbnail_image": "printer_thumbnail", + "printer_thumbnail_image": "printer_thumbnail_h2d", "printer_connect_help_image": "input_access_code_x1", "printer_use_ams_image": "ams_icon", "use_ams_type": "generic", diff --git a/src/slic3r/GUI/UpgradePanel.cpp b/src/slic3r/GUI/UpgradePanel.cpp index 1d801a4ec..199f780ff 100644 --- a/src/slic3r/GUI/UpgradePanel.cpp +++ b/src/slic3r/GUI/UpgradePanel.cpp @@ -414,7 +414,7 @@ void MachineInfoPanel::init_bitmaps() m_img_extra_ams = ScalableBitmap(this, "extra_icon", 160); } - m_img_air_pump = ScalableBitmap(this, "printer_thumbnail", 160);/*TODO: replace the bitmap*/ + m_img_air_pump = ScalableBitmap(this, "air_pump", 160); m_img_laser = ScalableBitmap(this, "laser", 160); m_img_cutting = ScalableBitmap(this, "cut", 160); @@ -446,7 +446,7 @@ MachineInfoPanel::~MachineInfoPanel() delete confirm_dlg; } -void MachineInfoPanel::Update_printer_img(MachineObject* obj) +void MachineInfoPanel::update_printer_imgs(MachineObject* obj) { if (!obj) {return;} auto img = obj->get_printer_thumbnail_img_str(); @@ -458,6 +458,7 @@ void MachineInfoPanel::Update_printer_img(MachineObject* obj) m_img_extra_ams = ScalableBitmap(this, "extra_icon", 160); } + m_img_printer = ScalableBitmap(this, img, 160); m_printer_img->SetBitmap(m_img_printer.bmp()); m_printer_img->Refresh(); @@ -469,7 +470,7 @@ void MachineInfoPanel::Update_printer_img(MachineObject* obj) void MachineInfoPanel::update(MachineObject* obj) { if (m_obj != obj) - Update_printer_img(obj); + update_printer_imgs(obj); m_obj = obj; if (obj) { @@ -1145,7 +1146,7 @@ void MachineInfoPanel::show_laszer(bool show) void MachineInfoPanel::on_sys_color_changed() { if (m_obj) { - Update_printer_img(m_obj); + update_printer_imgs(m_obj); } } diff --git a/src/slic3r/GUI/UpgradePanel.hpp b/src/slic3r/GUI/UpgradePanel.hpp index 2028505f4..7e9c84c80 100644 --- a/src/slic3r/GUI/UpgradePanel.hpp +++ b/src/slic3r/GUI/UpgradePanel.hpp @@ -163,7 +163,7 @@ public: ~MachineInfoPanel(); void on_sys_color_changed(); - void Update_printer_img(MachineObject* obj); + void update_printer_imgs(MachineObject* obj); void init_bitmaps(); void rescale_bitmaps();