From 38c35927581b117482bd8516424a53582b6d0f0d Mon Sep 17 00:00:00 2001
From: QIDI TECH <893239786@qq.com>
Date: Tue, 5 Aug 2025 16:12:34 +0800
Subject: [PATCH] fix some bug
---
resources/web/homepage3/img/left_home_account.svg | 11 +----------
resources/web/homepage3/js/left.js | 6 ++++--
src/slic3r/GUI/GLCanvas3D.cpp | 14 +++++++-------
3 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/resources/web/homepage3/img/left_home_account.svg b/resources/web/homepage3/img/left_home_account.svg
index 8e220e2..a0262a7 100644
--- a/resources/web/homepage3/img/left_home_account.svg
+++ b/resources/web/homepage3/img/left_home_account.svg
@@ -1,10 +1 @@
-
+
\ No newline at end of file
diff --git a/resources/web/homepage3/js/left.js b/resources/web/homepage3/js/left.js
index 6e23ebb..8528385 100644
--- a/resources/web/homepage3/js/left.js
+++ b/resources/web/homepage3/js/left.js
@@ -155,12 +155,14 @@ function SetLoginInfo( strAvatar, strName )
$("#UserName").text(strName);
$("#DropdownUserName").text(strName);
- let OriginAvatar=$("#UserAvatarIcon").prop("src");
- if(strAvatar!=OriginAvatar) {
+ //y69
+ let OriginAvatar=$("#UserAvatarIcon").prop("src");
+ if(strAvatar!=OriginAvatar && strAvatar.length != 0) {
$("#UserAvatarIcon").prop("src",strAvatar);
$("#DropdownAvatar").css("background-image", "url('"+strAvatar+"')");
}else
{
+ $("#Login2 #UserAvatarIcon").prop("src", "img/left_home_account.svg");
//alert('Avatar is Same');
}
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index 0277968..1dd199a 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -3251,13 +3251,6 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re
if (!current_print->is_step_done(psWipeTower) || !current_print->wipe_tower_data().wipe_tower_mesh_data) {
// update for wipe tower position
{
- int volume_idx_wipe_tower_new = m_volumes.load_wipe_tower_preview(1000 + plate_id, x + plate_origin(0), y + plate_origin(1),
- (float) wipe_tower_size(0), (float) wipe_tower_size(1), (float) wipe_tower_size(2),
- a,
- /*!print->is_step_done(psWipeTower)*/ true, brim_width, m_initialized);
- int volume_idx_wipe_tower_old = volume_idxs_wipe_tower_old[plate_id];
- if (volume_idx_wipe_tower_old != -1) map_glvolume_old_to_new[volume_idx_wipe_tower_old] = volume_idx_wipe_tower_new;
-
//y68
// update wipe_tower pos
{
@@ -3281,6 +3274,13 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re
dynamic_cast(proj_cfg.option("wipe_tower_x"))->set_at(&wt_x_opt, plate_id, 0);
dynamic_cast(proj_cfg.option("wipe_tower_y"))->set_at(&wt_y_opt, plate_id, 0);
+
+ int volume_idx_wipe_tower_new = m_volumes.load_wipe_tower_preview(1000 + plate_id, x + plate_origin(0), y + plate_origin(1),
+ (float) wipe_tower_size(0), (float) wipe_tower_size(1), (float) wipe_tower_size(2),
+ a,
+ /*!print->is_step_done(psWipeTower)*/ true, brim_width, m_initialized);
+ int volume_idx_wipe_tower_old = volume_idxs_wipe_tower_old[plate_id];
+ if (volume_idx_wipe_tower_old != -1) map_glvolume_old_to_new[volume_idx_wipe_tower_old] = volume_idx_wipe_tower_new;
}
} else {
auto tower_bottom = current_print->wipe_tower_data().wipe_tower_mesh_data->bottom;