From da89b56129dbda6806207c6c9a2d15bb28097bfd Mon Sep 17 00:00:00 2001
From: "zorro.zhang" <zorro.zhang@bambulab.com>
Date: Fri, 8 Dec 2023 14:33:43 +0800
Subject: [PATCH] NEW: Load Printer-Image First System Second Profiles

JIRA None

Change-Id: I183a5e4ed3e8e8ba6b3d8d7cde378e2ae853a5fb
(cherry picked from commit b1ea8183c67644e3a6421ad5dc634907a93c8f33)
---
 resources/web/guide/21/21.js      | 8 ++++++--
 resources/web/guide/24/24.js      | 7 +++++--
 src/slic3r/GUI/WebGuideDialog.cpp | 1 +
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/resources/web/guide/21/21.js b/resources/web/guide/21/21.js
index 729d2b152..0389d316a 100644
--- a/resources/web/guide/21/21.js
+++ b/resources/web/guide/21/21.js
@@ -103,9 +103,13 @@ function HandleModelList( pVal )
 		
 		let CoverImage="../../image/printer/"+OneModel['model']+"_cover.png";
 		let	CoverImage2="../../../profiles/"+strVendor+"/"+OneModel['model']+"_cover.png";
+		let CoverImage3=pVal['configpath']+"/system/"+strVendor+"/"+OneModel['model']+"_cover.png";
+		
+		//alert( 'FinalCover: '+FinalCover );
 		ModelHtml[strVendor]+='<div class="PrinterBlock">'+
-'	<div class="PImg"><img src="'+CoverImage+'" onerror="ShowPrinterThumb(this,\''+CoverImage2+'\')" /></div>'+
-'    <div class="PName">'+OneModel['model']+'</div>'+ HtmlNozzel +'</div>';
+        '	<div class="PImg"><img src="'+CoverImage3+'" onerror="ShowPrinterThumb(this,\''+CoverImage2+'\')" /></div>'+
+        '    <div class="PName">'+OneModel['model']+'</div>'+ HtmlNozzel +'</div>';
+		
 	}
 	
 	//Update Nozzel Html Append
diff --git a/resources/web/guide/24/24.js b/resources/web/guide/24/24.js
index 00ae24a2b..f18608bf8 100644
--- a/resources/web/guide/24/24.js
+++ b/resources/web/guide/24/24.js
@@ -102,9 +102,12 @@ function HandleModelList( pVal )
 		
 		let CoverImage="../../image/printer/"+OneModel['model']+"_cover.png";
 		let	CoverImage2="../../../profiles/"+strVendor+"/"+OneModel['model']+"_cover.png";
+		let CoverImage3=pVal['configpath']+"/system/"+strVendor+"/"+OneModel['model']+"_cover.png";
+		
+		//alert( 'FinalCover: '+FinalCover );
 		ModelHtml[strVendor]+='<div class="PrinterBlock">'+
-'	<div class="PImg"><img src="'+CoverImage+'" onerror="ShowPrinterThumb(this,\''+CoverImage2+'\')" /></div>'+
-'    <div class="PName">'+OneModel['model']+'</div>'+ HtmlNozzel +'</div>';
+        '	<div class="PImg"><img src="'+CoverImage3+'" onerror="ShowPrinterThumb(this,\''+CoverImage2+'\')" /></div>'+
+        '    <div class="PName">'+OneModel['model']+'</div>'+ HtmlNozzel +'</div>';
 	}
 	
 	//Update Nozzel Html Append
diff --git a/src/slic3r/GUI/WebGuideDialog.cpp b/src/slic3r/GUI/WebGuideDialog.cpp
index 881208cd0..beeaab553 100644
--- a/src/slic3r/GUI/WebGuideDialog.cpp
+++ b/src/slic3r/GUI/WebGuideDialog.cpp
@@ -1015,6 +1015,7 @@ int GuideFrame::LoadProfile()
         // BBS: change directories by design
         //BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(",  will load config from %1%.") % bbl_bundle_path;
         m_ProfileJson             = json::parse("{}");
+        m_ProfileJson["configpath"] = Slic3r::data_dir();
         m_ProfileJson["model"]    = json::array();
         m_ProfileJson["machine"]  = json::object();
         m_ProfileJson["filament"] = json::object();