3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 12:11:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

post changes after merging BS1.7.4

Browse source 
Remove tracking etc..
This commit is contained in:
SoftFever 2023-08-26 18:24:13 +08:00
parent e65b11a831
commit 2a478ab4f9
615 changed files with 46215 additions and 54844 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/web/guide/21/21.css
View file

@ -36,7 +36,7 @@
.PrinterArea
{
padding: 0px;
padding: 10px;
display: flex;
flex-wrap: wrap;
}
@ -45,7 +45,7 @@
{
width: 160px;
text-align: center;
padding: 8px;
padding: 10px;
}
.PrinterBlock img

28
resources/web/guide/21/21.js
View file

@ -68,7 +68,11 @@ function HandleModelList( pVal )
let sVV=strVendor;
if( sVV=="BBL" )
sVV="Bambu Lab";
if( sVV=="Custom")
sVV="Custom Printer";
if( sVV=="Other")
sVV="Orca colosseum";
let HtmlNewVendor='<div class="OneVendorBlock" Vendor="'+strVendor+'">'+
'<div class="BlockBanner">'+
' <div class="BannerBtns">'+
@ -81,10 +85,7 @@ function HandleModelList( pVal )
'</div>'+
'</div>';
if(sVV=='Bambu Lab')
$('#Content').html( HtmlNewVendor + $('#Content').html() );
else
$('#Content').append( HtmlNewVendor );
$('#Content').append(HtmlNewVendor);
}
let ModelName=OneModel['model'];
@ -101,10 +102,9 @@ 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 CoverImage2="../../../profiles/"+strVendor+"/"+OneModel['model']+"_cover.png";
let CoverImage=OneModel['cover'];
ModelHtml[strVendor]+='<div class="PrinterBlock">'+
' <div class="PImg"><img src="'+CoverImage+'" onerror="ShowPrinterThumb(this,\''+CoverImage2+'\')" /></div>'+
' <div class="PImg"><img src="'+CoverImage+'" /></div>'+
' <div class="PName">'+OneModel['model']+'</div>'+ HtmlNozzel +'</div>';
}
@ -139,12 +139,12 @@ function HandleModelList( pVal )
}
}
let AlreadySelect=$("input:checked");
let nSelect=AlreadySelect.length;
if(nSelect==0)
{
$("input[nozzel='0.4'][vendor='BBL']").prop("checked", true);
}
// let AlreadySelect=$("input:checked");
// let nSelect=AlreadySelect.length;
// if(nSelect==0)
// {
// $("input[nozzel='0.4'][vendor='Custom']").prop("checked", true);
// }
TranslatePage();
}

5
resources/web/guide/22/22.css
View file

@ -32,7 +32,6 @@ input
#ItemSelectArea
{
flex: 0 0 40px;
height:40px;
border-top: 1px solid #009688;
display: flex;
@ -47,7 +46,7 @@ input
#ItemBlockArea
{
flex: 1 0 236px;
flex: 1;
display:flex;
overflow-x:auto;
flex-wrap:wrap;
@ -60,7 +59,7 @@ input
.MItem
{
min-width: 220px;
width: 220px;
height: 32px;
}

27
resources/web/guide/22/index.html
View file

@ -19,7 +19,7 @@
<div id="Title">
<div class="trans" tid="t14">Filament Selection</div>
</div>
<div id="Content" class="ZScrol">
<div id="Content">
<div id="MachineList" class="ChooseBlock">
<div class="CName"><span class="trans" tid="t15">printer</span>：</div>
@ -33,15 +33,7 @@
<div><input type="checkbox" />Bambulab BBL-3DP-001-V4-normal</div>
<div><input type="checkbox" />Bambulab BBL-3DP-001-V4-normal</div>
<div><input type="checkbox" />Bambulab BBL-3DP-001-V5-normal</div>
<div><input type="checkbox" />Bambulab BBL-3DP-001-V4-normal</div>
<div><input type="checkbox" />Bambulab BBL-3DP-001-V5-normal</div>
<div><input type="checkbox" />Bambulab BBL-3DP-001-V4-normal</div>
<div><input type="checkbox" />Bambulab BBL-3DP-001-V4-normal</div>
<div><input type="checkbox" />Bambulab BBL-3DP-001-V5-normal</div>
<div><input type="checkbox" />Bambulab BBL-3DP-001-V4-normal</div>
<div><input type="checkbox" />Bambulab BBL-3DP-001-V4-normal</div>
<div><input type="checkbox" />Bambulab BBL-3DP-001-V5-normal</div>
<div><input type="checkbox" />Bambulab BBL-3DP-001-V4-normal</div> -->
<div><input type="checkbox" />Bambulab BBL-3DP-001-V4-normal</div> -->
</div>
</div>
@ -54,13 +46,7 @@
<div><input type="checkbox" />ABS</div>
<div><input type="checkbox" />TPU</div>
<div><input type="checkbox" />PA6+CF</div>
<div><input type="checkbox" />N/A</div>
<div><input type="checkbox" filatype="PLA" />PLA</div>
<div><input type="checkbox" />PET</div>
<div><input type="checkbox" />ABS</div>
<div><input type="checkbox" />TPU</div>
<div><input type="checkbox" />PA6+CF</div>
<div><input type="checkbox" />N/A</div> -->
<div><input type="checkbox" />N/A</div>-->
</div>
</div>
@ -72,12 +58,7 @@
<div><input type="checkbox" />BBL</div>
<div><input type="checkbox" />eSUN</div>
<div><input type="checkbox" />Kexcelled</div>
<div><input type="checkbox" />Polymaker</div>
<div><input type="checkbox" vendor="Unknow" />Unknown</div>
<div><input type="checkbox" />BBL</div>
<div><input type="checkbox" />eSUN</div>
<div><input type="checkbox" />Kexcelled</div>
<div><input type="checkbox" />Polymaker</div>-->
<div><input type="checkbox" />Polymaker</div>-->
</div>
</div>

5
resources/web/guide/23/23.css
View file

@ -32,7 +32,6 @@ input
#ItemSelectArea
{
flex: 0 0 40px;
height:40px;
border-top: 1px solid #009688;
display: flex;
@ -47,7 +46,7 @@ input
#ItemBlockArea
{
flex: 1 0 236px;
flex: 1;
display:flex;
overflow-x:auto;
flex-wrap:wrap;
@ -60,7 +59,7 @@ input
.MItem
{
min-width: 220px;
width: 220px;
height: 32px;
}

2
resources/web/guide/23/index.html
View file

@ -19,7 +19,7 @@
<div id="Title">
<div class="trans" tid="t14">Filament Selection</div>
</div>
<div id="Content" class="ZScrol">
<div id="Content">
<div id="MachineList" class="ChooseBlock">
<div class="CName"><span class="trans" tid="t15">printer</span>：</div>

4
resources/web/guide/24/24.css
View file

@ -59,7 +59,7 @@
.PrinterArea
{
padding: 0px;
padding: 10px;
display: flex;
flex-wrap: wrap;
}
@ -68,7 +68,7 @@
{
width: 160px;
text-align: center;
padding: 8px;
padding: 10px;
}
.PrinterBlock img

28
resources/web/guide/24/24.js
View file

@ -67,7 +67,11 @@ function HandleModelList( pVal )
let sVV=strVendor;
if( sVV=="BBL" )
sVV="Bambu Lab";
if( sVV=="Custom")
sVV="Custom Printer";
if( sVV=="Other")
sVV="Orca colosseum";
let HtmlNewVendor='<div class="OneVendorBlock" Vendor="'+strVendor+'">'+
'<div class="BlockBanner">'+
' <div class="BannerBtns">'+
@ -80,10 +84,7 @@ function HandleModelList( pVal )
'</div>'+
'</div>';
if(sVV=='Bambu Lab')
$('#Content').html( HtmlNewVendor + $('#Content').html() );
else
$('#Content').append( HtmlNewVendor );
$('#Content').append(HtmlNewVendor);
}
let ModelName=OneModel['model'];
@ -100,10 +101,9 @@ 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 CoverImage2="../../../profiles/"+strVendor+"/"+OneModel['model']+"_cover.png";
let CoverImage=OneModel['cover'];
ModelHtml[strVendor]+='<div class="PrinterBlock">'+
' <div class="PImg"><img src="'+CoverImage+'" onerror="ShowPrinterThumb(this,\''+CoverImage2+'\')" /></div>'+
' <div class="PImg"><img src="'+CoverImage+'" /></div>'+
' <div class="PName">'+OneModel['model']+'</div>'+ HtmlNozzel +'</div>';
}
@ -138,12 +138,12 @@ function HandleModelList( pVal )
}
}
let AlreadySelect=$("input:checked");
let nSelect=AlreadySelect.length;
if(nSelect==0)
{
$("input[nozzel='0.4'][vendor='BBL']").prop("checked", true);
}
// let AlreadySelect=$("input:checked");
// let nSelect=AlreadySelect.length;
// if(nSelect==0)
// {
// $("input[nozzel='0.4'][vendor='Custom']").prop("checked", true);
// }
TranslatePage();
}