GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-06-04 11:25:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Show proper printer names on printer selection page (#9363)

Browse Source 
* Show actual printer name from sub_path files on printer selection screen

* Merge branch 'main' into bugfox/preset-name-consistency
This commit is contained in:
Noisyfox 2025-05-04 16:02:15 +08:00 committed by GitHub
parent 86f4c3a014
commit 038b25627e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,7 +105,7 @@ function HandleModelList( pVal )
let CoverImage=OneModel['cover']; let CoverImage=OneModel['cover'];
ModelHtml[strVendor]+='<div class="PrinterBlock">'+ ModelHtml[strVendor]+='<div class="PrinterBlock">'+
' <div class="PImg"><img src="'+CoverImage+'" /></div>'+ ' <div class="PImg"><img src="'+CoverImage+'" /></div>'+
' <div class="PName">'+OneModel['model']+'</div>'+ HtmlNozzel +'</div>'; ' <div class="PName">'+OneModel['name']+'</div>'+ HtmlNozzel +'</div>';
} }
//Update Nozzel Html Append //Update Nozzel Html Append
@ -224,7 +224,7 @@ function FilterModelList(keyword) {
let OneModel = pModel[n]; let OneModel = pModel[n];
let strVendor = OneModel['vendor']; let strVendor = OneModel['vendor'];
let search = (OneModel['model'] + '\0' + strVendor).toLowerCase(); let search = (OneModel['name'] + '\0' + strVendor).toLowerCase();
if (!kwSplit.every(s => search.includes(s))) if (!kwSplit.every(s => search.includes(s)))
continue; continue;
@ -269,7 +269,7 @@ function FilterModelList(keyword) {
let CoverImage = OneModel['cover']; let CoverImage = OneModel['cover'];
ModelHtml[strVendor] += '<div class="PrinterBlock">' + ModelHtml[strVendor] += '<div class="PrinterBlock">' +
' <div class="PImg"><img src="' + CoverImage + '" /></div>' + ' <div class="PImg"><img src="' + CoverImage + '" /></div>' +
' <div class="PName">' + OneModel['model'] + '</div>' + HtmlNozzel + '</div>'; ' <div class="PName">' + OneModel['name'] + '</div>' + HtmlNozzel + '</div>';
} }
//Update Nozzel Html Append //Update Nozzel Html Append

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

@ -105,7 +105,7 @@ function HandleModelList( pVal )
let CoverImage=OneModel['cover']; let CoverImage=OneModel['cover'];
ModelHtml[strVendor]+='<div class="PrinterBlock">'+ ModelHtml[strVendor]+='<div class="PrinterBlock">'+
' <div class="PImg"><img src="'+CoverImage+'" /></div>'+ ' <div class="PImg"><img src="'+CoverImage+'" /></div>'+
' <div class="PName">'+OneModel['model']+'</div>'+ HtmlNozzel +'</div>'; ' <div class="PName">'+OneModel['name']+'</div>'+ HtmlNozzel +'</div>';
} }
//Update Nozzel Html Append //Update Nozzel Html Append
@ -224,7 +224,7 @@ function FilterModelList(keyword) {
let OneModel = pModel[n]; let OneModel = pModel[n];
let strVendor = OneModel['vendor']; let strVendor = OneModel['vendor'];
let search = (OneModel['model'] + '\0' + strVendor).toLowerCase(); let search = (OneModel['name'] + '\0' + strVendor).toLowerCase();
if (!kwSplit.every(s => search.includes(s))) if (!kwSplit.every(s => search.includes(s)))
continue; continue;
@ -269,7 +269,7 @@ function FilterModelList(keyword) {
let CoverImage = OneModel['cover']; let CoverImage = OneModel['cover'];
ModelHtml[strVendor] += '<div class="PrinterBlock">' + ModelHtml[strVendor] += '<div class="PrinterBlock">' +
' <div class="PImg"><img src="' + CoverImage + '" /></div>' + ' <div class="PImg"><img src="' + CoverImage + '" /></div>' +
' <div class="PName">' + OneModel['model'] + '</div>' + HtmlNozzel + '</div>'; ' <div class="PName">' + OneModel['name'] + '</div>' + HtmlNozzel + '</div>';
} }
//Update Nozzel Html Append //Update Nozzel Html Append

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

@ -1212,6 +1212,7 @@ int GuideFrame::LoadProfileFamily(std::string strVendor, std::string strFilePath
json pm = json::parse(contents); json pm = json::parse(contents);
// wxLogMessage("GUIDE: json_path2 loaded"); // wxLogMessage("GUIDE: json_path2 loaded");
OneModel["name"] = pm["name"];
OneModel["vendor"] = strVendor; OneModel["vendor"] = strVendor;
std::string NozzleOpt = pm["nozzle_diameter"]; std::string NozzleOpt = pm["nozzle_diameter"];
StringReplace(NozzleOpt, " ", ""); StringReplace(NozzleOpt, " ", "");