From 506e1f45084e8fd4efbf9abfa46d7aea4ebe3291 Mon Sep 17 00:00:00 2001 From: Ocraftyone Date: Thu, 9 Nov 2023 09:01:07 -0500 Subject: [PATCH] fix a few todos --- src/slic3r/GUI/ExtraRenderers.cpp | 2 +- src/slic3r/GUI/PresetComboBoxes.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/ExtraRenderers.cpp b/src/slic3r/GUI/ExtraRenderers.cpp index d1952f0f3f..4d307cdb58 100644 --- a/src/slic3r/GUI/ExtraRenderers.cpp +++ b/src/slic3r/GUI/ExtraRenderers.cpp @@ -320,7 +320,7 @@ wxWindow* BitmapChoiceRenderer::CreateEditorCtrl(wxWindow* parent, wxRect labelR c_editor->Append(_L("default"), *get_default_extruder_color_icon()); for (size_t i = 0; i < icons.size(); i++) - c_editor->Append(wxString::Format("%d", i+1), icons[i]->GetBitmapFor(parent)); //OcraftyoneTODO: quick n dirty conversion + c_editor->Append(wxString::Format("%d", i+1), *icons[i]); if (has_default_extruder && has_default_extruder()) c_editor->SetSelection(atoi(data.GetText().c_str())); diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp index 9d2ffecd56..80ec5f16f7 100644 --- a/src/slic3r/GUI/PresetComboBoxes.cpp +++ b/src/slic3r/GUI/PresetComboBoxes.cpp @@ -397,8 +397,8 @@ void PresetComboBox::add_ams_filaments(std::string selected, bool alias_name) const_cast(*iter).is_visible = true; auto color = tray.opt_string("filament_colour", 0u); auto name = tray.opt_string("tray_name", 0u); - wxBitmap bmp(get_extruder_color_icon(color, name, 24, 16)->GetBitmapFor(m_parent)); //OcraftyoneTODO: conversion rather than updating correctly - int item_id = Append(get_preset_name(*iter), bmp.ConvertToImage(), &m_first_ams_filament + entry.first); +// wxBitmap bmp(get_extruder_color_icon(color, name, 24, 16)->GetBitmapFor(m_parent)); //OcraftyoneTODO: conversion rather than updating correctly + int item_id = Append(get_preset_name(*iter), *get_extruder_color_icon(color, name, 24, 16), &m_first_ams_filament + entry.first); //validate_selection(id->value == selected); // can not select } m_last_ams_filament = GetCount();