QIDITECH/QIDISlicer
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDISlicer.git synced 2026-01-30 23:48:44 +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

13
resources/web/guide/img/MenuBtnIcon.svg
View File

@@ -1 +1,12 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687832492956" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10887" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M972.146238 0.005962h-3.629346c-15.683959 0.907336-246.277047 15.683959-374.341111 93.714898-27.479334 16.850535-36.16384 49.12579-41.867098 104.602935a94.362995 94.362995 0 0 0-67.920617-31.627158 85.16001 85.16001 0 0 0-52.625517 18.924447c-47.051878 37.330416-207.391197 171.356977-277.256107 332.862872C68.698334 717.320267 82.826859 863.66068 83.474957 869.752797c0 1.555434 0.907336 2.981248 1.166575 4.536682-47.959214 61.439642-77.123602 104.732555-80.364089 109.398857a25.9239 25.9239 0 0 0 7.129073 35.515743A25.9239 25.9239 0 0 0 25.9239 1024a25.9239 25.9239 0 0 0 21.387217-11.406516c0-1.036956 27.479334-40.830142 72.716539-98.899677h1.685053A250.295251 250.295251 0 0 0 181.467298 920.304401c99.547775 0 305.902016-38.88585 570.325793-296.958271C987.570958 393.012282 1019.716594 99.294498 1023.086701 58.723595A47.829595 47.829595 0 0 0 1023.994038 51.853762a51.070082 51.070082 0 0 0-51.8478-51.8478zM716.406968 586.404573C461.575034 835.533249 267.405025 868.456602 181.467298 868.456602c-10.499179 0-18.794827 0-25.9239-1.166576 87.363542-107.195325 220.353147-251.202588 368.378615-349.972645a25.9239 25.9239 0 0 0-28.51629-42.644815c-145.173838 97.214624-272.200947 232.148522-361.89764 338.825369a795.215623 795.215623 0 0 1 67.531759-274.274859c64.809749-151.136335 221.001245-280.626214 262.220245-312.901469a33.182592 33.182592 0 0 1 20.998359-8.166029c45.237205 0 81.401045 108.750759 100.195872 108.75076h1.944293c16.202437-7.517931 9.591843-173.560508 34.349167-188.72599C741.034672 64.815712 972.146238 51.853762 972.146238 51.853762s-19.054066 303.180007-255.73927 534.550811z" fill="#4479FB" p-id="10888"></path></svg>
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="20px" height="20px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">
<path fill="#4479FB" d="M19,0L19,0c-0.4,0-4.9,0.3-7.4,1.8c-0.5,0.3-0.7,1-0.8,2C10.4,3.5,10,3.3,9.5,3.3c-0.4,0-0.7,0.1-1,0.4
C7.5,4.4,4.4,7,3,10.1C1.3,14,1.6,16.9,1.6,17c0,0,0,0.1,0,0.1c-0.9,1.2-1.5,2-1.6,2.1c-0.1,0.2-0.1,0.5,0.1,0.7
C0.3,20,0.4,20,0.5,20c0.2,0,0.3-0.1,0.4-0.2c0,0,0.5-0.8,1.4-1.9h0C2.8,17.9,3.2,18,3.5,18c1.9,0,6-0.8,11.1-5.8
c4.6-4.5,5.2-10.2,5.3-11c0,0,0-0.1,0-0.1C20,0.5,19.6,0,19,0C19,0,19,0,19,0z M14,11.5C9,16.3,5.2,17,3.5,17c-0.2,0-0.4,0-0.5,0
c1.7-2.1,4.3-4.9,7.2-6.8c0.2-0.2,0.2-0.5,0-0.7c-0.1-0.2-0.4-0.2-0.6-0.1c-2.8,1.9-5.3,4.5-7.1,6.6c0.1-1.9,0.6-3.7,1.3-5.4
c1.3-3,4.3-5.5,5.1-6.1c0.1-0.1,0.3-0.2,0.4-0.2c0.9,0,1.6,2.1,2,2.1h0c0.3-0.1,0.2-3.4,0.7-3.7C14.5,1.3,19,1,19,1
S18.6,6.9,14,11.5L14,11.5z"/>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
resources/web/guide/img/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

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;