profile cover image reorg

This commit is contained in:
SoftFever committed 2023-05-07 23:52:11 +08:00
1 parent c9b20a0e10
commit c81ca8c9d7
62 files changed
+10 -4

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "Custom Printer",
"version": "01.05.01.02",
"version": "01.06.00.00",
"force_update": "0",
"description": "My configurations",
"machine_model_list": [
+1 -1
View File
@@ -96,7 +96,7 @@ function HandleModelList( pVal )
HtmlNozzel+='<div class="pNozzel TextS2"><input type="checkbox" model="'+OneModel['model']+'" nozzel="'+nNozzel+'" vendor="'+strVendor+'" /><span>'+nNozzel+'</span><span class="trans" tid="t13">mm nozzle</span></div>';
}
let CoverImage="../../image/printer/"+OneModel['model']+"_cover.png";
let CoverImage=OneModel['cover'];
ModelHtml[strVendor]+='<div class="PrinterBlock">'+
' <div class="PImg"><img src="'+CoverImage+'" /></div>'+
' <div class="PName">'+OneModel['model']+'</div>'+ HtmlNozzel +'</div>';
+1 -1
View File
@@ -96,7 +96,7 @@ function HandleModelList( pVal )
HtmlNozzel+='<div class="pNozzel TextS2"><input type="checkbox" model="'+OneModel['model']+'" nozzel="'+nNozzel+'" vendor="'+strVendor+'" /><span>'+nNozzel+'</span><span class="trans" tid="t13">mm nozzle</span></div>';
}
let CoverImage="../../image/printer/"+OneModel['model']+"_cover.png";
let CoverImage=OneModel['cover'];
ModelHtml[strVendor]+='<div class="PrinterBlock">'+
' <div class="PImg"><img src="'+CoverImage+'" /></div>'+
' <div class="PName">'+OneModel['model']+'</div>'+ HtmlNozzel +'</div>';
+7 -1
View File
@@ -1354,7 +1354,13 @@ int GuideFrame::LoadProfileFamily(std::string strVendor, std::string strFilePath
// wxString strCoverPath = wxString::Format("%s\\%s\\%s_cover.png", strFolder, strVendor, std::string(s1.mb_str()));
std::string cover_file = s1 + "_cover.png";
boost::filesystem::path cover_path = boost::filesystem::absolute(vendor_dir / cover_file).make_preferred();
boost::filesystem::path cover_path = boost::filesystem::absolute(boost::filesystem::path(resources_dir()) / "/profiles/" / strVendor / cover_file).make_preferred();
if (!boost::filesystem::exists(cover_path)) {
cover_path =
(boost::filesystem::absolute(boost::filesystem::path(resources_dir()) / "/web/image/printer/") /
cover_file)
.make_preferred();
}
OneModel["cover"] = cover_path.string();
OneModel["nozzle_selected"] = "";