3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 07:27:41 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

profile cover image reorg

Browse source
This commit is contained in:
SoftFever 2023-05-07 23:47:21 +08:00
parent c9b20a0e10
commit c81ca8c9d7
62 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

0
resources/web/image/printer/Anker M5_cover.png → resources/profiles/Anker/Anker M5_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

0
resources/web/image/printer/Anycubic 4Max Pro_cover.png → resources/profiles/Anycubic/Anycubic 4Max Pro_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before After
Before After

0
resources/web/image/printer/Artillery Genius_cover.png → resources/profiles/Artillery/Artillery Genius_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Before After
Before After

0
resources/web/image/printer/Artillery Hornet_cover.png → resources/profiles/Artillery/Artillery Hornet_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Before After
Before After

0
resources/web/image/printer/Artillery Sidewinder X2_cover.png → resources/profiles/Artillery/Artillery Sidewinder X2_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Before After
Before After

0
resources/web/image/printer/Creality CR-10 Max_cover.png → resources/profiles/Creality/Creality CR-10 Max_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Before After
Before After

0
resources/web/image/printer/Creality CR-10 V2_cover.png → resources/profiles/Creality/Creality CR-10 V2_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Before After
Before After

0
resources/web/image/printer/Creality Ender-3 S1 Pro_cover.png → resources/profiles/Creality/Creality Ender-3 S1 Pro_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Before After
Before After

0
resources/web/image/printer/Creality Ender-3 S1_cover.png → resources/profiles/Creality/Creality Ender-3 S1_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Before After
Before After

0
resources/web/image/printer/Creality Ender-3 V2_cover.png → resources/profiles/Creality/Creality Ender-3 V2_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Before After
Before After

0
resources/web/image/printer/Creality Ender-5 Plus_cover.png → resources/profiles/Creality/Creality Ender-5 Plus_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Before After
Before After

0
resources/web/image/printer/Creality Ender-5 Pro (2019)_cover.png → resources/profiles/Creality/Creality Ender-5 Pro (2019)_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Before After
Before After

0
resources/web/image/printer/Creality Ender-5 S1_cover.png → resources/profiles/Creality/Creality Ender-5 S1_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Before After
Before After

0
resources/web/image/printer/Creality Ender-5S_cover.png → resources/profiles/Creality/Creality Ender-5S_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Before After
Before After

0
resources/web/image/printer/Creality Ender-5_cover.png → resources/profiles/Creality/Creality Ender-5_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Before After
Before After

0
resources/web/image/printer/Creality Ender-6_cover.png → resources/profiles/Creality/Creality Ender-6_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Before After
Before After

2
resources/profiles/Custom.json
View file

@ -1,6 +1,6 @@
{ {
"name": "Custom Printer", "name": "Custom Printer",
"version": "01.05.01.02", "version": "01.06.00.00",
"force_update": "0", "force_update": "0",
"description": "My configurations", "description": "My configurations",
"machine_model_list": [ "machine_model_list": [

0
resources/web/image/printer/Generaic Klipper Printer_cover.png → resources/profiles/Custom/Generic Klipper Printer_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before After
Before After

0
resources/web/image/printer/Generic Marlin Printer_cover.png → resources/profiles/Custom/Generic Marlin Printer_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

Before After
Before After

0
resources/web/image/printer/Elegoo Neptune 3 Max_cover.png → resources/profiles/Elegoo/Elegoo Neptune 3 Max_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Before After
Before After

0
resources/web/image/printer/Elegoo Neptune 3 Plus_cover.png → resources/profiles/Elegoo/Elegoo Neptune 3 Plus_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Before After
Before After

0
resources/web/image/printer/Elegoo Neptune 3 Pro_cover.png → resources/profiles/Elegoo/Elegoo Neptune 3 Pro_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Before After
Before After

0
resources/web/image/printer/Elegoo Neptune 3_cover.png → resources/profiles/Elegoo/Elegoo Neptune 3_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Before After
Before After

0
resources/web/image/printer/FLSun V400_cover.png → resources/profiles/FLSun/FLSun V400_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

0
resources/web/image/printer/Orca Arena X1 Carbon_cover.png → resources/profiles/OrcaArena/Orca Arena X1 Carbon_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 284 KiB

After

Width:  |  Height:  |  Size: 284 KiB

Before After
Before After

0
resources/web/image/printer/Prusa MINI_cover.png → resources/profiles/Prusa/Prusa MINI_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 58 KiB

Before After
Before After

0
resources/web/image/printer/Prusa MK3S_cover.png → resources/profiles/Prusa/Prusa MK3S_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 84 KiB

After

Width:  |  Height:  |  Size: 84 KiB

Before After
Before After

0
resources/web/image/printer/Qidi X-CF Pro_cover.png → resources/profiles/Qidi/Qidi X-CF Pro_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Before After
Before After

0
resources/web/image/printer/Qidi X-Max 3_cover.png → resources/profiles/Qidi/Qidi X-Max 3_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Before After
Before After

0
resources/web/image/printer/Qidi X-Max_cover.png → resources/profiles/Qidi/Qidi X-Max_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Before After
Before After

0
resources/web/image/printer/Qidi X-Plus 3_cover.png → resources/profiles/Qidi/Qidi X-Plus 3_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Before After
Before After

0
resources/web/image/printer/Qidi X-Plus_cover.png → resources/profiles/Qidi/Qidi X-Plus_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Before After
Before After

0
resources/web/image/printer/Qidi X-Smart 3_cover.png → resources/profiles/Qidi/Qidi X-Smart 3_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Before After
Before After

0
resources/web/image/printer/RatRig V-Cast_cover.png → resources/profiles/Ratrig/RatRig V-Cast_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 51 KiB

Before After
Before After

0
resources/web/image/printer/RatRig V-Core 3 200_cover.png → resources/profiles/Ratrig/RatRig V-Core 3 200_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 82 KiB

After

Width:  |  Height:  |  Size: 82 KiB

Before After
Before After

0
resources/web/image/printer/RatRig V-Core 3 300_cover.png → resources/profiles/Ratrig/RatRig V-Core 3 300_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 82 KiB

After

Width:  |  Height:  |  Size: 82 KiB

Before After
Before After

0
resources/web/image/printer/RatRig V-Core 3 400_cover.png → resources/profiles/Ratrig/RatRig V-Core 3 400_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 82 KiB

After

Width:  |  Height:  |  Size: 82 KiB

Before After
Before After

0
resources/web/image/printer/RatRig V-Core 3 500_cover.png → resources/profiles/Ratrig/RatRig V-Core 3 500_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 82 KiB

After

Width:  |  Height:  |  Size: 82 KiB

Before After
Before After

0
resources/web/image/printer/RatRig V-Minion_cover.png → resources/profiles/Ratrig/RatRig V-Minion_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 60 KiB

Before After
Before After

0
resources/web/image/printer/SecKit SK-Tank_cover.png → resources/profiles/SecKit/SecKit SK-Tank_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 133 KiB

After

Width:  |  Height:  |  Size: 133 KiB

Before After
Before After

0
resources/web/image/printer/Seckit Go3_cover.png → resources/profiles/SecKit/Seckit Go3_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 442 KiB

After

Width:  |  Height:  |  Size: 442 KiB

Before After
Before After

0
resources/web/image/printer/Snapmaker A250_cover.png → resources/profiles/Snapmaker/Snapmaker A250_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Before After
Before After

0
resources/web/image/printer/Snapmaker A350_cover.png → resources/profiles/Snapmaker/Snapmaker A350_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Before After
Before After

0
resources/web/image/printer/Snapmaker J1_cover.png → resources/profiles/Snapmaker/Snapmaker J1_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Before After
Before After

0
resources/web/image/printer/Sovol SV01 Pro_cover.png → resources/profiles/Sovol/Sovol SV01 Pro_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Before After
Before After

0
resources/web/image/printer/Sovol SV02_cover.png → resources/profiles/Sovol/Sovol SV02_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Before After
Before After

0
resources/web/image/printer/Sovol SV05_cover.png → resources/profiles/Sovol/Sovol SV05_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Before After
Before After

0
resources/web/image/printer/Tronxy X5SA 400 Marlin Firmware_cover.png → resources/profiles/Tronxy/Tronxy X5SA 400 Marlin Firmware_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Before After
Before After

0
resources/web/image/printer/TwoTrees SP-5 Klipper_cover.png → resources/profiles/TwoTrees/TwoTrees SP-5 Klipper_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 47 KiB

Before After
Before After

0
resources/web/image/printer/Voron 0.1_cover.png → resources/profiles/Voron/Voron 0.1_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 52 KiB

Before After
Before After

0
resources/web/image/printer/Voron 2.4 250_cover.png → resources/profiles/Voron/Voron 2.4 250_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Before After
Before After

0
resources/web/image/printer/Voron 2.4 300_cover.png → resources/profiles/Voron/Voron 2.4 300_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Before After
Before After

0
resources/web/image/printer/Voron 2.4 350_cover.png → resources/profiles/Voron/Voron 2.4 350_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Before After
Before After

0
resources/web/image/printer/Voron Trident 250_cover.png → resources/profiles/Voron/Voron Trident 250_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

Before After
Before After

0
resources/web/image/printer/Voron Trident 300_cover.png → resources/profiles/Voron/Voron Trident 300_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

Before After
Before After

0
resources/web/image/printer/Voron Trident 350_cover.png → resources/profiles/Voron/Voron Trident 350_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

Before After
Before After

0
resources/web/image/printer/Voxelab Aquila X2_cover.png → resources/profiles/Voxelab/Voxelab Aquila X2_cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Before After
Before After

0
resources/web/image/printer/Vzbot 235 AWD_cover.PNG → resources/profiles/Vzbot/Vzbot 235 AWD_cover.PNG
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

Before After
Before After

0
resources/web/image/printer/Vzbot 330 AWD_cover.PNG → resources/profiles/Vzbot/Vzbot 330 AWD_cover.PNG
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 45 KiB

Before After
Before After

2
resources/web/guide/21/21.js
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>'; 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">'+ 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['model']+'</div>'+ HtmlNozzel +'</div>';

2
resources/web/guide/24/24.js
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>'; 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">'+ 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['model']+'</div>'+ HtmlNozzel +'</div>';

8
src/slic3r/GUI/WebGuideDialog.cpp
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())); // wxString strCoverPath = wxString::Format("%s\\%s\\%s_cover.png", strFolder, strVendor, std::string(s1.mb_str()));
std::string cover_file = s1 + "_cover.png"; 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["cover"] = cover_path.string();
OneModel["nozzle_selected"] = ""; OneModel["nozzle_selected"] = "";