mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NEW: Load Printer-Image First System Second Profiles 

JIRA None

Change-Id: I183a5e4ed3e8e8ba6b3d8d7cde378e2ae853a5fb
(cherry picked from commit b1ea8183c67644e3a6421ad5dc634907a93c8f33)
This commit is contained in:
zorro.zhang 2023-12-08 14:33:43 +08:00 committed by Lane.Wei
parent a9227daca1
commit da89b56129
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/web/guide/21/21.js
View File

@ -103,9 +103,13 @@ function HandleModelList( pVal )
let CoverImage="../../image/printer/"+OneModel['model']+"_cover.png"; let CoverImage="../../image/printer/"+OneModel['model']+"_cover.png";
let CoverImage2="../../../profiles/"+strVendor+"/"+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">'+ ModelHtml[strVendor]+='<div class="PrinterBlock">'+
' <div class="PImg"><img src="'+CoverImage+'" onerror="ShowPrinterThumb(this,\''+CoverImage2+'\')" /></div>'+ ' <div class="PImg"><img src="'+CoverImage3+'" onerror="ShowPrinterThumb(this,\''+CoverImage2+'\')" /></div>'+
' <div class="PName">'+OneModel['model']+'</div>'+ HtmlNozzel +'</div>'; ' <div class="PName">'+OneModel['model']+'</div>'+ HtmlNozzel +'</div>';
} }
//Update Nozzel Html Append //Update Nozzel Html Append

7
resources/web/guide/24/24.js
View File

@ -102,9 +102,12 @@ function HandleModelList( pVal )
let CoverImage="../../image/printer/"+OneModel['model']+"_cover.png"; let CoverImage="../../image/printer/"+OneModel['model']+"_cover.png";
let CoverImage2="../../../profiles/"+strVendor+"/"+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">'+ ModelHtml[strVendor]+='<div class="PrinterBlock">'+
' <div class="PImg"><img src="'+CoverImage+'" onerror="ShowPrinterThumb(this,\''+CoverImage2+'\')" /></div>'+ ' <div class="PImg"><img src="'+CoverImage3+'" onerror="ShowPrinterThumb(this,\''+CoverImage2+'\')" /></div>'+
' <div class="PName">'+OneModel['model']+'</div>'+ HtmlNozzel +'</div>'; ' <div class="PName">'+OneModel['model']+'</div>'+ HtmlNozzel +'</div>';
} }
//Update Nozzel Html Append //Update Nozzel Html Append

1
src/slic3r/GUI/WebGuideDialog.cpp
View File

@ -1015,6 +1015,7 @@ int GuideFrame::LoadProfile()
// BBS: change directories by design // BBS: change directories by design
//BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", will load config from %1%.") % bbl_bundle_path; //BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", will load config from %1%.") % bbl_bundle_path;
m_ProfileJson = json::parse("{}"); m_ProfileJson = json::parse("{}");
m_ProfileJson["configpath"] = Slic3r::data_dir();
m_ProfileJson["model"] = json::array(); m_ProfileJson["model"] = json::array();
m_ProfileJson["machine"] = json::object(); m_ProfileJson["machine"] = json::object();
m_ProfileJson["filament"] = json::object(); m_ProfileJson["filament"] = json::object();