QIDITECH/QIDISlicer
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDISlicer.git synced 2026-01-31 16:08:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix some bugs

Browse Source
This commit is contained in:
sunsets
2024-01-17 14:35:16 +08:00
parent 2f7a8a7568
commit ec37905b75
6 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/BitmapCache.cpp
View File

@@ -403,11 +403,12 @@ wxBitmapBundle* BitmapCache::from_svg(const std::string& bitmap_name, unsigned t
return it->second;
// map of color replaces
//B48
std::map<std::string, std::string> replaces;
if (dark_mode)
replaces["#808080"] = "#FFFFFF";
if (!new_color.empty())
replaces["#ED6B21"] = new_color;
replaces["#4479FB"] = new_color;
replaces["#ButtonBG"] = dark_mode ? "#4E4E4E" : "#828282";
@@ -461,11 +462,12 @@ wxBitmap* BitmapCache::load_svg(const std::string &bitmap_name, unsigned target_
return it->second;
// map of color replaces
//B48
std::map<std::string, std::string> replaces;
if (dark_mode)
replaces["#808080"] = "#FFFFFF";
if (!new_color.empty())
replaces["#ED6B21"] = new_color;
replaces["#4479FB"] = new_color;
NSVGimage *image = nsvgParseFromFileWithReplace(Slic3r::var(bitmap_name + ".svg").c_str(), "px", 96.0f, replaces);
if (image == nullptr)

6
src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
View File

@@ -321,7 +321,13 @@ void GLGizmoEmboss::create_volume(ModelVolumeType volume_type, const Vec2d &mous
return ;
// NOTE: change style manager - be carefull with order changes
#if defined(__linux__)
m_style_manager.get_font_prop().size_in_mm = 8;
#elif defined(__APPLE__)
m_style_manager.get_font_prop().size_in_mm = 9.2;
#else
m_style_manager.get_font_prop().size_in_mm = 7;
#endif
DataBasePtr base = create_emboss_data_base(str, m_style_manager, m_text_lines, m_parent.get_selection(), volume_type, m_job_cancel);
CreateVolumeParams input = create_input(m_parent, m_style_manager.get_style(), m_raycast_manager, volume_type);

9
src/slic3r/GUI/Plater.cpp
View File

@@ -5555,7 +5555,7 @@ void Plater::calib_pa_line(const double StartPA, double EndPA, double PAStep)
DynamicPrintConfig new_config;
//B34 Get parameter
double start_x = plate_center.x() - 40;
double start_x = plate_center.x() - 38;
double start_y = plate_center.y() - count * step_spacing / 2;
const double speed_fast = 7200;
const double speed_slow = 1200;
@@ -5582,9 +5582,11 @@ void Plater::calib_pa_line(const double StartPA, double EndPA, double PAStep)
const double e_per_mm = line_flow.mm3_per_mm() / filament_area * print_flow_ratio;
// Position aided model
select_all();
wxGetApp().plater()->get_camera().select_view("top");
sidebar().obj_manipul()->on_change("position", 0, plate_center.x() - 50);
sidebar().obj_manipul()->set_uniform_scaling(false);
sidebar().obj_manipul()->on_change("size", 0, 25);
sidebar().obj_manipul()->on_change("size", 1, count * step_spacing + pa_line_width);
sidebar().obj_manipul()->on_change("size", 2, pa_first_layer_height);
sidebar().obj_manipul()->set_uniform_scaling(true);
@@ -5676,7 +5678,7 @@ void Plater::calib_pa_pattern(const double StartPA, double EndPA, double PAStep)
const double step_spacing = 4.62;
double line_spacing = pa_line_width - pa_layer_height * (1 - M_PI / 4);
double line_spacing_xy = line_spacing * 1.4142;
const double pa_wall_length = 42 - line_spacing;
const double pa_wall_length = 38 - line_spacing;
int max_count = int((plate_center.y() * 2 - pa_wall_length / 2) / step_spacing) - 4;
if (count > max_count) {
count = max_count;
@@ -5694,9 +5696,11 @@ void Plater::calib_pa_pattern(const double StartPA, double EndPA, double PAStep)
double retract_speed = double(printer_config->opt_float("retract_speed", 0)) * 60;
// Position aided model
select_all();
wxGetApp().plater()->get_camera().select_view("top");
sidebar().obj_manipul()->on_change("position", 0, plate_center.x() - 31);
sidebar().obj_manipul()->set_uniform_scaling(false);
sidebar().obj_manipul()->on_change("size", 0, 25);
sidebar().obj_manipul()->on_change("size", 1, pa_wall_width + line_spacing);
double pa_first_layer_height = print_config->get_abs_value("first_layer_height");
sidebar().obj_manipul()->on_change("size", 2, pa_first_layer_height);
@@ -5796,6 +5800,7 @@ void Plater::calib_pa_tower(const double StartPA, double EndPA, double PAStep)
}
// Scale model height
select_all();
sidebar().obj_manipul()->set_uniform_scaling(false);
sidebar().obj_manipul()->on_change("size", 2, (count + 1) * 5);
sidebar().obj_manipul()->set_uniform_scaling(true);

3
src/slic3r/GUI/Widgets/UIColors.hpp
View File

@@ -8,7 +8,8 @@ static const int clr_border_disabled = 0x646464;//0xDBDBDB;
static const int clr_background_normal_light = 0xFFFFFF;
static const int clr_background_normal_dark = 0x2B2B2B;//0x434343;
static const int clr_background_focused = 0xED6B21;//0xEDFAF2;
//B48
static const int clr_background_focused = 0x4479FB;//0xEDFAF2;
static const int clr_background_disabled_dark = 0x404040;//0xF0F0F0;
static const int clr_background_disabled_light = 0xD9D9D9;//0xF0F0F0;