mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: remove N1 setting and auto match textures based on printing area 

Change-Id: Ia208c7436901a722c8c4e2caa3d7573fd0714432
This commit is contained in:
zhou.xu 2023-08-11 17:21:58 +08:00 committed by Lane.Wei
parent 771bc38a02
commit fd89e4c256
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/slic3r/GUI/PartPlate.cpp
View File

@ -1774,7 +1774,7 @@ Vec3d PartPlate::get_center_origin()
bool PartPlate::generate_plate_name_texture() bool PartPlate::generate_plate_name_texture()
{ {
auto bed_ext = get_extents(m_shape); auto bed_ext = get_extents(m_shape);
int bed_width = bed_ext.size()(1); int bed_width = bed_ext.size()(0);
wxString cur_plate_name = from_u8(m_name); wxString cur_plate_name = from_u8(m_name);
wxGCDC dc; wxGCDC dc;
wxString limitTextWidth = wxControl::Ellipsize(cur_plate_name, dc, wxELLIPSIZE_END, bed_width); wxString limitTextWidth = wxControl::Ellipsize(cur_plate_name, dc, wxELLIPSIZE_END, bed_width);
@ -4626,7 +4626,7 @@ bool PartPlateList::set_shapes(const Pointfs& shape, const Pointfs& exclude_area
pos = compute_shape_position(i, m_plate_cols); pos = compute_shape_position(i, m_plate_cols);
plate->set_shape(shape, exclude_areas, pos, height_to_lid, height_to_rod); plate->set_shape(shape, exclude_areas, pos, height_to_lid, height_to_rod);
} }
is_load_bedtype_textures = false;//reload textures
calc_bounding_boxes(); calc_bounding_boxes();
auto check_texture = [](const std::string& texture) { auto check_texture = [](const std::string& texture) {
@ -5167,7 +5167,9 @@ void PartPlateList::init_bed_type_info()
BedTextureInfo::TexturePart pei_part2(72, -11, 150, 12, "bbl_bed_pei_bottom.svg"); BedTextureInfo::TexturePart pei_part2(72, -11, 150, 12, "bbl_bed_pei_bottom.svg");
BedTextureInfo::TexturePart pte_part1( 6, 40, 12, 200, "bbl_bed_pte_left.svg"); BedTextureInfo::TexturePart pte_part1( 6, 40, 12, 200, "bbl_bed_pte_left.svg");
BedTextureInfo::TexturePart pte_part2(72, -11, 150, 12, "bbl_bed_pte_bottom.svg"); BedTextureInfo::TexturePart pte_part2(72, -11, 150, 12, "bbl_bed_pte_bottom.svg");
for (size_t i = 0; i < btCount; i++) {
bed_texture_info[i].parts.clear();
}
bed_texture_info[btPC].parts.push_back(pc_part1); bed_texture_info[btPC].parts.push_back(pc_part1);
bed_texture_info[btPC].parts.push_back(pc_part2); bed_texture_info[btPC].parts.push_back(pc_part2);
bed_texture_info[btEP].parts.push_back(ep_part1); bed_texture_info[btEP].parts.push_back(ep_part1);
@ -5177,8 +5179,19 @@ void PartPlateList::init_bed_type_info()
bed_texture_info[btPTE].parts.push_back(pte_part1); bed_texture_info[btPTE].parts.push_back(pte_part1);
bed_texture_info[btPTE].parts.push_back(pte_part2); bed_texture_info[btPTE].parts.push_back(pte_part2);
auto bed_ext = get_extents(m_shape);
int bed_width = bed_ext.size()(0);
int bed_height = bed_ext.size()(1);
float base_width = 256;
float base_height = 256;
float x_rate = bed_width / base_width;
float y_rate = bed_height / base_height;
for (int i = 0; i < btCount; i++) { for (int i = 0; i < btCount; i++) {
for (int j = 0; j < bed_texture_info[i].parts.size(); j++) { for (int j = 0; j < bed_texture_info[i].parts.size(); j++) {
bed_texture_info[i].parts[j].x *= x_rate;
bed_texture_info[i].parts[j].y *= y_rate;
bed_texture_info[i].parts[j].w *= x_rate;
bed_texture_info[i].parts[j].h *= y_rate;
bed_texture_info[i].parts[j].update_buffer(); bed_texture_info[i].parts[j].update_buffer();
} }
} }