mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-12-29 02:40:33 -07:00
* fixed logic error in PLA jamming gcode for P1S
* Fix use after free bug in LinesBucketQueue::emplace_back_bucket
I found a use after free bug in LinesBucketQueue::emplace_back_bucket. This was found by enabling address sanitizer.
The LinesBucketQueue class has two related members:
std::vector<LinesBucket> line_buckets;
std::priority_queue<LinesBucket *, std::vector<LinesBucket *>, LinesBucketPtrComp> line_bucket_ptr_queue;
line_bucket_ptr_queue holds pointers into line_buckets. However, since items are inserted into line_buckets one at a time, existing pointers that were stored inside line_bucket_ptr_queue become invalid. Specifically:
void LinesBucketQueue::emplace_back_bucket(ExtrusionLayers &&els, const void *objPtr, Point offset)
{
auto oldSize = line_buckets.capacity();
line_buckets.emplace_back(std::move(els), objPtr, offset); <--- Causes a reallocation, making previous pointers invalid
line_bucket_ptr_queue.push(&line_buckets.back()); <-- priority queue compares against old, now invalid pointers
...
The proposed fix is to calculate the required number of entries in ConflictChecker::find_inter_of_lines_in_diff_objs, and then calling line_buckets.reserve(count). This ensures that sufficient buffer is allocated up front and the pointers are stable as items are added.
* Updated to fix the handling of the capacity change, and removed the code I previously added to reserve upfront since it is not really needed
* Remove accidentally added whitespace
* Removed unused method
* ENH:add mz_zip_reader_extract_to_file_w api
to solove plugin install failed problem by special wide char
jira: none
Change-Id: Ic7d3efe3fdf852387650abf9df65803da9e46a60
(cherry picked from commit b68ad03717a63675fef2f3ef73d4058bf311adea)
* FIX: PrinterFileSystem report real connect error
Change-Id: I99d6ff7f6dcb1f53ccf59854f5f19d0bd39fa9fc
Jira: none
* rename preference name
* FIX:Relax restrictions on importing obj files
jira: none
Change-Id: I61a0156a8424a5f59922956918d37d38e2c3306a
* FIX: [6469] popup dialog too mach when reload object
Jira: 6469
Change-Id: I4097e3a3b018c7a676fea93bf63f8f778bb3148b
* FIX:fixed incorrect display of printer options page on Linux
jira:[STUDIO-6220]
Change-Id: Id1f084658b0b340b7f17ab97ba82c0fd3ae83fae
* FIX: handle exception of dividing by zero in arranging
jira: none
Change-Id: I0d20464dbe81a80293539100f06d72dee456a27b
(cherry picked from commit 94746ae9bf7f467243849570450567b4fdc78e3a)
* ENH:delete no use code
jira: none
Change-Id: I40e7ffa7ea47bb3cd4039eef9f6c28c604eb3abc
* FIX: PrinterFileSystem::FileRemoved
Change-Id: I891aaa8d58ff379dc1ebd8581064865a33388f74
* FIX: resend ttcode to printer on -90 error
Change-Id: I96dc45102a2759a9f1a0002f42c3a91b2c6b2d75
Jira: STUDIO-5947
(cherry picked from commit 97d687b7c88f8cd51b8eddd39120349d8eac42b1)
* FIX: fix some issue in multi machine
JIRA: STUDIO-6934 STUDIO-6888
1. Fix the issue of incomplete display caused by excessively long file names
2. Fix the issue of icon display being too large
3. Fix the issue of garbled Chinese characters in the task list
Change-Id: I36bc10bf2067f44aaa7e3651b58e526ea323c8ad
* FIX: Incorrect multiplier, when the multiplier is set to below 1
github: #3987 #3805
1. In some languages that use commas as decimal points, setting multiplier below 1 will resolve to 0
2. Unable to save multiplier correctly
Change-Id: I62bc55e270929ebb5e910eb79c6f97106e842b93
* Arrange
* FIX: wrong wipe tower when open 3mf file
1.wipe tower pos in 3mf was overwritten by default pos when opening 3mf
with a different printer profile.This patch fix it
jira: STUDIO-5890
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I12e5d4b80a0ad86194db0682c1763ba4a9492521
* ENH: update A1 machine gcode
1.Adjust the y position of the A1 extrusion compensation line
jira:NEW
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Iea690a0184ae10a47f53e1532272c31fc0a04cfa
* FIX: minor spelling mistake in gcode
github:#3477
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Id3201bf8b8125ce060e2cac102ab2525877e27c1
* FIX: slice crash with height_range
github: 3917
Change-Id: Icdf83013213b47935b7a795ed75cc3d49057665d
* FIX: ERROR_RES_BUSY text
Change-Id: Ifde1a7b0c6ab915eb226c2072c46edd40f60cf9a
Jira: STUDIO-6436
* ENH:Unable to send printing without selecting a device
jira:[STUDIO-6850]
Change-Id: Ic537579727fd1618af364db93fce8fbbe4cd635a
* FIX:add exit_gizmo before slice model
jira: STUDIO-5531
Change-Id: Icddc9d73b3d91bb68e9768d13e48cbae0680e58e
* FIX: PrinterFileSystem report real connect error
Change-Id: Id6750cfa2a98fe8325ba677dabb606a0a701b495
* FIX: add can slice judgement in slice all plates processing
jira: STUDIO-6325
Change-Id: Ic7fb8cef000c03210bb77289a570ee6b60b6083e
* FIX:Fixed error in displaying the name of Bambu filaments
Change-Id: Ib42194c07b6eefe793eec81a588debc9d622d951
* FIX: text hidden in calibration tab
jira: STUDIO-6264
Change-Id: I24fbc590638a3213d948a973422e010486113923
* FIX: logic error in PLA fan control
github PR: #3948
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I28e4a673e590e83d151e92cc82caab45012aeabe
* FIX:upgrade cluster algorithm to remove duplicate labels
jira: none
Change-Id: I4d68d8cd8e080932c7c308bc8f69e27546ffe309
* FIX: can not parse json float in ES on macOS
jira: STUDIO-5889
Change-Id: I622f4b474c378d77b0e43d67a320f023be2d5811
* ENH:Clear the value of the previous nozzle type
jira:[for nozzle check]
Change-Id: I9a932b833fb07de6cb0a91abe6372b0e91f273f1
* ENH: update A1 gcode
1.Modify the width of extrusion compensation line
jira:NEW
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I90543758c866d74f2154e3135d7569109def84b8
* FIX: the height range is not valid in assemble object
github: 3876
Change-Id: Id38672bbf0c01bc9b9f0a3e2bf1052d945b45131
* FIX: calibration page text hidden in linux
jira: STUDIO-6264
Change-Id: If210abf64057eb2e9c2c5b11d41fa33f18684c72
* ENH:clear nozzle information
jira:[STUDIO-7050]
Change-Id: I15ca4973d09132ddb5cb5a56bedd795ba6976b27
* update plugin version
---------
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Co-authored-by: afriede <me@afriede.dev>
Co-authored-by: Momin Al-Ghosien <momin@sanestudios.com>
Co-authored-by: zhou.xu <zhou.xu@bambulab.com>
Co-authored-by: chunmao.guo <chunmao.guo@bambulab.com>
Co-authored-by: maosheng.wei <maosheng.wei@bambulab.com>
Co-authored-by: tao wang <tao.wang@bambulab.com>
Co-authored-by: Arthur <arthur.tang@bambulab.com>
Co-authored-by: Kunlong Ma <kunlong.ma@bambulab.com>
Co-authored-by: xun.zhang <xun.zhang@bambulab.com>
Co-authored-by: zhimin.zeng <zhimin.zeng@bambulab.com>
Co-authored-by: liz.li <liz.li@bambulab.com>
262 lines
11 KiB
C++
262 lines
11 KiB
C++
#pragma once
|
|
#include <iostream>
|
|
#include <ctime>
|
|
|
|
#include "opencv2/opencv.hpp"
|
|
|
|
class QuantKMeans
|
|
{
|
|
public:
|
|
int m_alpha_thres;
|
|
cv::Mat m_flatten_labels;
|
|
cv::Mat m_centers8UC3;
|
|
QuantKMeans(int alpha_thres = 10) : m_alpha_thres(alpha_thres) {}
|
|
void apply(cv::Mat &ori_image, cv::Mat &new_image, int num_cluster, int color_space)
|
|
{
|
|
cv::Mat image;
|
|
convert_color_space(ori_image, image, color_space);
|
|
cv::Mat flatten_image = flatten(image);
|
|
|
|
apply(flatten_image, num_cluster, color_space);
|
|
replace_centers(ori_image, new_image);
|
|
}
|
|
void apply_aplha(cv::Mat &ori_image, cv::Mat &new_image, int num_cluster, int color_space)
|
|
{
|
|
// cout << " *** DoAlpha *** " << endl;
|
|
cv::Mat flatten_image8UC3 = flatten_alpha(ori_image);
|
|
cv::Mat image8UC3;
|
|
convert_color_space(flatten_image8UC3, image8UC3, color_space);
|
|
cv::Mat image32FC3(image8UC3.rows, 1, CV_32FC3);
|
|
for (int i = 0; i < image8UC3.rows; i++)
|
|
image32FC3.at<cv::Vec3f>(i, 0) = image8UC3.at<cv::Vec3b>(i, 0);
|
|
|
|
apply(image32FC3, num_cluster, color_space);
|
|
repalce_centers_aplha(ori_image, new_image);
|
|
}
|
|
void apply(cv::Mat &flatten_image, int num_cluster, int color_space)
|
|
{
|
|
cv::Mat centers32FC3;
|
|
num_cluster = fmin(flatten_image.rows, num_cluster);
|
|
kmeans(flatten_image, num_cluster, this->m_flatten_labels, cv::TermCriteria(cv::TermCriteria::EPS + cv::TermCriteria::COUNT, 300, 0.5), 3, cv::KMEANS_PP_CENTERS,
|
|
centers32FC3);
|
|
this->m_centers8UC3 = cv::Mat(num_cluster, 1, CV_8UC3);
|
|
for (int i = 0; i < num_cluster; i++) this->m_centers8UC3.at<cv::Vec3b>(i) = centers32FC3.at<cv::Vec3f>(i);
|
|
|
|
convert_color_space(this->m_centers8UC3, this->m_centers8UC3, color_space, true);
|
|
}
|
|
void apply(const std::vector<std::array<float, 4>> &ori_colors,
|
|
std::vector<std::array<float, 4>> & cluster_results,
|
|
std::vector<int> & labels,
|
|
int num_cluster = -1,
|
|
int max_cluster = 15,
|
|
int color_space = 2)
|
|
{
|
|
// 0~255
|
|
cv::Mat flatten_image8UC3 = flatten_vector(ori_colors);
|
|
|
|
this->apply(flatten_image8UC3, cluster_results, labels, num_cluster, max_cluster, color_space);
|
|
}
|
|
void apply(const cv::Mat & flatten_image8UC3,
|
|
std::vector<std::array<float, 4>> &cluster_results,
|
|
std::vector<int> & labels,
|
|
int num_cluster = -1,
|
|
int max_cluster = 15,
|
|
int color_space = 2)
|
|
{
|
|
cv::Mat image8UC3;
|
|
convert_color_space(flatten_image8UC3, image8UC3, color_space);
|
|
|
|
cv::Mat image32FC3(image8UC3.rows, 1, CV_32FC3);
|
|
for (int i = 0; i < image8UC3.rows; i++)
|
|
image32FC3.at<cv::Vec3f>(i, 0) = image8UC3.at<cv::Vec3b>(i, 0);
|
|
|
|
int best_cluster = 1;
|
|
double cur_score = 0, best_score = 100;
|
|
num_cluster = fmin(num_cluster, max_cluster);
|
|
if (num_cluster < 1) {
|
|
if (!this->more_than_request(image8UC3, max_cluster)) max_cluster = compute_num_colors(image8UC3);
|
|
num_cluster = fmin(num_cluster, max_cluster);
|
|
cur_score = cv::kmeans(image32FC3, 1, this->m_flatten_labels, cv::TermCriteria(cv::TermCriteria::EPS + cv::TermCriteria::COUNT, 300, 0.5), 3, cv::KMEANS_PP_CENTERS);
|
|
best_score = cur_score;
|
|
|
|
for (int cur_cluster = 2; cur_cluster < max_cluster + 1; cur_cluster++) {
|
|
cv::Mat centers32FC3;
|
|
cur_score = cv::kmeans(image32FC3, cur_cluster, this->m_flatten_labels, cv::TermCriteria(cv::TermCriteria::EPS + cv::TermCriteria::COUNT, 300, 0.5), 3,
|
|
cv::KMEANS_PP_CENTERS, centers32FC3);
|
|
if (this->repeat_center(cur_cluster, centers32FC3, color_space))
|
|
break;
|
|
best_cluster = cur_score < best_score ? cur_cluster : best_cluster;
|
|
best_score = cur_score < best_score ? cur_score : best_score;
|
|
}
|
|
} else if (this->more_than_request(image8UC3, num_cluster))
|
|
best_cluster = num_cluster;
|
|
else {
|
|
best_cluster = compute_num_colors(image8UC3);
|
|
std::cout << "num of image color is " << best_cluster << ", less than custom number " << num_cluster << std::endl;
|
|
}
|
|
|
|
cv::Mat centers32FC3;
|
|
cv::kmeans(image32FC3, best_cluster, this->m_flatten_labels, cv::TermCriteria(cv::TermCriteria::EPS + cv::TermCriteria::COUNT, 300, 0.5), 3, cv::KMEANS_PP_CENTERS,
|
|
centers32FC3);
|
|
this->m_centers8UC3 = cv::Mat(best_cluster, 1, CV_8UC3);
|
|
for (int i = 0; i < best_cluster; i++) {
|
|
auto center = centers32FC3.row(i);
|
|
this->m_centers8UC3.at<cv::Vec3b>(i) = {uchar(center.at<float>(0)), uchar(center.at<float>(1)), uchar(center.at<float>(2))};
|
|
}
|
|
convert_color_space(this->m_centers8UC3, this->m_centers8UC3, color_space, true);
|
|
|
|
cluster_results.clear();
|
|
labels.clear();
|
|
for (int i = 0; i < flatten_image8UC3.rows; i++)
|
|
labels.emplace_back(this->m_flatten_labels.at<int>(i, 0));
|
|
for (int i = 0; i < best_cluster; i++) {
|
|
cv::Vec3f center = this->m_centers8UC3.at<cv::Vec3b>(i, 0);
|
|
cluster_results.emplace_back(std::array<float, 4>{center[0] / 255.f, center[1] / 255.f, center[2] / 255.f, 1.f});
|
|
}
|
|
}
|
|
|
|
bool more_than_request(const cv::Mat &image8UC3, int target_num)
|
|
{
|
|
std::vector<cv::Vec3b> uniqueImage;
|
|
cv::Vec3b cur_color;
|
|
for (int i = 0; i < image8UC3.rows; i++) {
|
|
cur_color = image8UC3.at<cv::Vec3b>(i, 0);
|
|
if (!is_in(cur_color, uniqueImage)) {
|
|
uniqueImage.emplace_back(cur_color);
|
|
if (uniqueImage.size() >= target_num) return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
int compute_num_colors(const cv::Mat &image8UC3)
|
|
{
|
|
std::vector<cv::Vec3b> uniqueImage;
|
|
cv::Vec3b cur_color;
|
|
for (int i = 0; i < image8UC3.rows; i++) {
|
|
cur_color = image8UC3.at<cv::Vec3b>(i, 0);
|
|
if (!is_in(cur_color, uniqueImage)) uniqueImage.emplace_back(cur_color);
|
|
}
|
|
|
|
return uniqueImage.size();
|
|
}
|
|
|
|
bool is_in(const cv::Vec3b &cur_color, const std::vector<cv::Vec3b> &uniqueImage)
|
|
{
|
|
for (auto &color : uniqueImage)
|
|
if (cur_color[0] == color[0] && cur_color[1] == color[1] && cur_color[2] == color[2]) return true;
|
|
return false;
|
|
}
|
|
|
|
bool repeat_center(int cur_cluster, const cv::Mat ¢ers32FC3, int color_space)
|
|
{
|
|
cv::Mat centers8UC3 = cv::Mat(cur_cluster, 1, CV_8UC3);
|
|
for (int i = 0; i < cur_cluster; i++) {
|
|
auto center = centers32FC3.row(i);
|
|
centers8UC3.at<cv::Vec3b>(i) = {uchar(center.at<float>(0)), uchar(center.at<float>(1)), uchar(center.at<float>(2))};
|
|
}
|
|
convert_color_space(centers8UC3, centers8UC3, color_space, true);
|
|
std::vector<cv::Vec3b> unique_centers;
|
|
cv::Vec3b cur_center;
|
|
for (int i = 0; i < cur_cluster; i++) {
|
|
cur_center = centers8UC3.at<cv::Vec3b>(i, 0);
|
|
if (!is_in(cur_center, unique_centers))
|
|
unique_centers.emplace_back(cur_center);
|
|
else
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
void replace_centers(cv::Mat &ori_image, cv::Mat &new_image)
|
|
{
|
|
for (int i = 0; i < ori_image.rows; i++) {
|
|
for (int j = 0; j < ori_image.cols; j++) {
|
|
int idx = this->m_flatten_labels.at<int>(i * ori_image.cols + j, 0);
|
|
cv::Vec3b pixel = this->m_centers8UC3.at<cv::Vec3b>(idx);
|
|
new_image.at<cv::Vec3b>(i, j) = pixel;
|
|
}
|
|
}
|
|
}
|
|
void repalce_centers_aplha(cv::Mat &ori_image, cv::Mat &new_image)
|
|
{
|
|
int cnt = 0;
|
|
int idx;
|
|
cv::Vec3b center;
|
|
for (int i = 0; i < ori_image.rows; i++) {
|
|
for (int j = 0; j < ori_image.cols; j++) {
|
|
cv::Vec4b pixel = ori_image.at<cv::Vec4b>(i, j);
|
|
if ((int) pixel[3] < this->m_alpha_thres)
|
|
new_image.at<cv::Vec4b>(i, j) = pixel;
|
|
else {
|
|
idx = this->m_flatten_labels.at<int>(cnt++, 0);
|
|
center = this->m_centers8UC3.at<cv::Vec3b>(idx);
|
|
new_image.at<cv::Vec4b>(i, j) = cv::Vec4b(center[0], center[1], center[2], pixel[3]);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void convert_color_space(const cv::Mat &ori_image, cv::Mat &image, int color_space, bool reverse = false)
|
|
{
|
|
switch (color_space) {
|
|
case 0: image = ori_image; break;
|
|
case 1:
|
|
if (reverse)
|
|
cvtColor(ori_image, image, cv::COLOR_HSV2BGR);
|
|
else
|
|
cvtColor(ori_image, image, cv::COLOR_BGR2HSV);
|
|
break;
|
|
case 2:
|
|
if (reverse)
|
|
cvtColor(ori_image, image, cv::COLOR_Lab2BGR);
|
|
else
|
|
cvtColor(ori_image, image, cv::COLOR_BGR2Lab);
|
|
break;
|
|
default: break;
|
|
}
|
|
}
|
|
|
|
cv::Mat flatten(cv::Mat &image)
|
|
{
|
|
int num_pixels = image.rows * image.cols;
|
|
cv::Mat img(num_pixels, 1, CV_32FC3);
|
|
for (int i = 0; i < image.rows; i++) {
|
|
for (int j = 0; j < image.cols; j++) {
|
|
cv::Vec3f pixel = image.at<cv::Vec3b>(i, j);
|
|
img.at<cv::Vec3f>(i * image.cols + j, 0) = pixel;
|
|
}
|
|
}
|
|
return img;
|
|
}
|
|
cv::Mat flatten_alpha(cv::Mat &image)
|
|
{
|
|
int num_pixels = image.rows * image.cols;
|
|
for (int i = 0; i < image.rows; i++)
|
|
for (int j = 0; j < image.cols; j++) {
|
|
cv::Vec4b pixel = image.at<cv::Vec4b>(i, j);
|
|
if ((int) pixel[3] < this->m_alpha_thres) num_pixels--;
|
|
}
|
|
|
|
cv::Mat img(num_pixels, 1, CV_8UC3);
|
|
int cnt = 0;
|
|
for (int i = 0; i < image.rows; i++) {
|
|
for (int j = 0; j < image.cols; j++) {
|
|
cv::Vec4b pixel = image.at<cv::Vec4b>(i, j);
|
|
if ((int) pixel[3] >= this->m_alpha_thres) img.at<cv::Vec3b>(cnt++, 0) = cv::Vec3b(pixel[0], pixel[1], pixel[2]);
|
|
}
|
|
}
|
|
return img;
|
|
}
|
|
cv::Mat flatten_vector(const std::vector<std::array<float, 4>> &ori_colors)
|
|
{
|
|
int num_pixels = ori_colors.size();
|
|
|
|
cv::Mat image8UC3(num_pixels, 1, CV_8UC3);
|
|
for (int i = 0; i < num_pixels; i++) {
|
|
std::array<float, 4> pixel = ori_colors[i];
|
|
image8UC3.at<cv::Vec3b>(i, 0) = cv::Vec3b((int) (pixel[0] * 255.f), (int) (pixel[1] * 255.f), (int) (pixel[2] * 255.f));
|
|
}
|
|
return image8UC3;
|
|
}
|
|
};
|