diff --git a/resources/web/guide/21/21.js b/resources/web/guide/21/21.js index 4ade5cb150..cd359610b6 100644 --- a/resources/web/guide/21/21.js +++ b/resources/web/guide/21/21.js @@ -105,7 +105,7 @@ function HandleModelList( pVal ) let CoverImage=OneModel['cover']; ModelHtml[strVendor]+='
'+ '
'+ -'
'+OneModel['model']+'
'+ HtmlNozzel +'
'; +'
'+OneModel['name']+'
'+ HtmlNozzel +''; } //Update Nozzel Html Append @@ -224,7 +224,7 @@ function FilterModelList(keyword) { let OneModel = pModel[n]; 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))) continue; @@ -269,7 +269,7 @@ function FilterModelList(keyword) { let CoverImage = OneModel['cover']; ModelHtml[strVendor] += '
' + '
' + - '
' + OneModel['model'] + '
' + HtmlNozzel + '
'; + '
' + OneModel['name'] + '
' + HtmlNozzel + ''; } //Update Nozzel Html Append diff --git a/resources/web/guide/24/24.js b/resources/web/guide/24/24.js index a536da029b..f653a4298d 100644 --- a/resources/web/guide/24/24.js +++ b/resources/web/guide/24/24.js @@ -105,7 +105,7 @@ function HandleModelList( pVal ) let CoverImage=OneModel['cover']; ModelHtml[strVendor]+='
'+ '
'+ -'
'+OneModel['model']+'
'+ HtmlNozzel +'
'; +'
'+OneModel['name']+'
'+ HtmlNozzel +''; } //Update Nozzel Html Append @@ -224,7 +224,7 @@ function FilterModelList(keyword) { let OneModel = pModel[n]; 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))) continue; @@ -269,7 +269,7 @@ function FilterModelList(keyword) { let CoverImage = OneModel['cover']; ModelHtml[strVendor] += '
' + '
' + - '
' + OneModel['model'] + '
' + HtmlNozzel + '
'; + '
' + OneModel['name'] + '
' + HtmlNozzel + ''; } //Update Nozzel Html Append diff --git a/src/slic3r/GUI/WebGuideDialog.cpp b/src/slic3r/GUI/WebGuideDialog.cpp index 95994e999b..eb1006b036 100644 --- a/src/slic3r/GUI/WebGuideDialog.cpp +++ b/src/slic3r/GUI/WebGuideDialog.cpp @@ -1212,6 +1212,7 @@ int GuideFrame::LoadProfileFamily(std::string strVendor, std::string strFilePath json pm = json::parse(contents); // wxLogMessage("GUIDE: json_path2 loaded"); + OneModel["name"] = pm["name"]; OneModel["vendor"] = strVendor; std::string NozzleOpt = pm["nozzle_diameter"]; StringReplace(NozzleOpt, " ", "");