juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 11:23:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update the Filament Selection Guide page by moving the generic filaments to the front.

Browse Source
This commit is contained in:
SoftFever
2025-09-11 23:09:48 +08:00
parent 466aa76642
commit d76524f03f
4 changed files with 39 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
resources/web/guide/22/22.js
View File

@@ -2,16 +2,14 @@
var m_ProfileItem;
var FilamentPriority=new Array( "pla","abs","pet","tpu","pc");
var VendorPriority=new Array("Generic","Orca Built-in","bambu lab","bambulab","bbl","kexcelled","polymaker","esun");
var VendorPriority=new Array("generic");
function OnInit()
{
TranslatePage();
RequestProfile();
//m_ProfileItem=cData;
//SortUI();
}
function RequestProfile()
@@ -23,15 +21,6 @@ function RequestProfile()
SendWXMessage( JSON.stringify(tSend) );
}
//function RequestModelSelect()
//{
// var tSend={};
// tSend['sequence_id']=Math.round(new Date() / 1000);
// tSend['command']="request_userguide_modelselected";
//
// SendWXMessage( JSON.stringify(tSend) );
//}
function HandleStudio(pVal)
{
let strCmd=pVal['command'];
@@ -65,30 +54,6 @@ function SortUI()
ModelList.push(OneMode);
}
//machine
// let HtmlMachine='';
//
// let nMachine=m_ProfileItem['machine'].length;
// for(let n=0;n<nMachine;n++)
// {
// let OneMachine=m_ProfileItem['machine'][n];
//
// let sName=OneMachine['name'];
// let sModel=OneMachine['model'];
//
// if( ModelList.in_array(sModel) )
// {
// HtmlMachine+='<div><input type="checkbox" mode="'+sModel+'" onChange="MachineClick()" />'+sName+'</div>';
// }
// }
//
// $('#MachineList .CValues').append(HtmlMachine);
// $('#MachineList .CValues input').prop("checked",true);
// if(nMachine<=1)
// {
// $('#MachineList').hide();
// }
//model
let HtmlMode='';
nMode=ModelList.length;
@@ -112,6 +77,8 @@ function SortUI()
var TypeHtmlArray={};
var VendorHtmlArray={};
var GenericFilamentHtmlArray={};
var NonGenericFilamentHtmlArray={};
for( let key in m_ProfileItem['filament'] )
{
let OneFila=m_ProfileItem['filament'][key];
@@ -125,14 +92,6 @@ function SortUI()
let fSelect=OneFila['selected'];
let fModel=OneFila['models']
//alert( fWholeName+' - '+fShortName+' - '+fVendor+' - '+fType+' - '+fSelect+' - '+fModel );
// if(OneFila['name'].indexOf("Bambu PA-CF")>=0)
// {
// alert( fShortName+' - '+fVendor+' - '+fType+' - '+fSelect+' - '+fModel )
//
// let b=1+2;
// }
let bFind=false;
//let bCheck=$("#MachineList input:first").prop("checked");
@@ -195,7 +154,12 @@ function SortUI()
/* ORCA use label tag to allow checkbox to toggle when user ckicked to text */
let HtmlFila='<label class="MItem"><input type="checkbox" vendor="'+fVendor+'" filatype="'+fType+'" filalist="'+fWholeName+';'+'" model="'+fModel+'" name="'+fShortName+'" />'+fShortName+'</label>';
$("#ItemBlockArea").append(HtmlFila);
// Separate generic and non-generic filaments
if(fVendor.toLowerCase() === 'generic') {
GenericFilamentHtmlArray[fShortName] = HtmlFila;
} else {
NonGenericFilamentHtmlArray[fShortName] = HtmlFila;
}
}
else
{
@@ -221,6 +185,14 @@ function SortUI()
// $("#ItemBlockArea input[vendor='"+fVendor+"'][model='"+fModel+"'][filatype='"+fType+"'][name='"+key+"']").prop("checked",false);
}
}
// Append filaments in order: generic first, then non-generic
for(let key in GenericFilamentHtmlArray) {
$("#ItemBlockArea").append(GenericFilamentHtmlArray[key]);
}
for(let key in NonGenericFilamentHtmlArray) {
$("#ItemBlockArea").append(NonGenericFilamentHtmlArray[key]);
}
//Sort TypeArray
let TypeAdvNum=FilamentPriority.length;

94
resources/web/guide/22/index.html
View File

@@ -25,23 +25,6 @@
<div class="CName"><span class="trans" tid="t15">printer</span>：</div>
<div class="CValues">
<label><input type="checkbox" mode="all" onClick="ChooseAllMachine()" /><span class="trans" tid="t11">all</span></label>
<!-- <div><input type="checkbox" mode="-normal" onChange="SortFilament()" />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-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>
</div>
@@ -49,35 +32,13 @@
<div class="CName"><span class="trans" tid="t16">filament type</span>：</div>
<div class="CValues">
<label><input type="checkbox" class="trans" tid="t11" onClick="ChooseAllFilament()" /><span class="trans" tid="t11">all</span></label>
<!-- <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" 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>
</div>
<div id="VendorList" class="ChooseBlock">
<div class="CName"><span class="trans" tid="t17">vendor</span>：</div>
<div class="CValues">
<label><input type="checkbox" class="trans" tid="t11" onClick="ChooseAllVendor()" /><span class="trans" tid="t11">all</span></label>
<!-- <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" 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>-->
<label><input type="checkbox" class="trans" tid="t11" onClick="ChooseAllVendor()" /><span class="trans" tid="t11">all</span></label>
</div>
</div>
@@ -87,59 +48,6 @@
<div class="SmallBtn trans" tid="t12" onClick="SelectAllFilament(0)">Clear all</div>
</div>
<div id="ItemBlockArea" class="ZScrol">
<!-- <div class="MItem"><input type="checkbox" vendor="" filatype="" model="ALL PLA EXPSilk" name="" />ALL PLA EXPSilk</div>
<div class="MItem"><input type="checkbox" />ALL PLA Silk</div>
<div class="MItem"><input type="checkbox" />BBL PA-CF</div>
<div class="MItem"><input type="checkbox" />Geneic ABS</div>
<div class="MItem"><input type="checkbox" />Geneic PETG</div>
<div class="MItem"><input type="checkbox" />Geneic PLA</div>
<div class="MItem"><input type="checkbox" />Geneic TPU</div>
<div class="MItem"><input type="checkbox" />Geneic TPU83</div>
<div class="MItem"><input type="checkbox" />Geneic TPU87</div>
<div class="MItem"><input type="checkbox" />Geneic TPU90</div>
<div class="MItem"><input type="checkbox" />Geneic TPU95</div>
<div class="MItem"><input type="checkbox" />K5 ABS</div>
<div class="MItem"><input type="checkbox" />K5 ASA</div>
<div class="MItem"><input type="checkbox" />K5 PETG</div>
<div class="MItem"><input type="checkbox" />K5 PLA~</div>
<div class="MItem"><input type="checkbox" />K5 Silk PLA</div>
<div class="MItem"><input type="checkbox" />K5 Sparkle PLA</div>
<div class="MItem"><input type="checkbox" />K5M PLA~</div>
<div class="MItem"><input type="checkbox" />K5P PLA~</div>
<div class="MItem"><input type="checkbox" />K5P PLA~</div>
<div class="MItem"><input type="checkbox" />ALL PLA EXPSilk</div>
<div class="MItem"><input type="checkbox" />ALL PLA Silk</div>
<div class="MItem"><input type="checkbox" />BBL PA-CF</div>
<div class="MItem"><input type="checkbox" />Geneic ABS</div>
<div class="MItem"><input type="checkbox" />Geneic PETG</div>
<div class="MItem"><input type="checkbox" />Geneic PLA</div>
<div class="MItem"><input type="checkbox" />Geneic TPU</div>
<div class="MItem"><input type="checkbox" />Geneic TPU83</div>
<div class="MItem"><input type="checkbox" />Geneic TPU87</div>
<div class="MItem"><input type="checkbox" />Geneic TPU90</div>
<div class="MItem"><input type="checkbox" />Geneic TPU95</div>
<div class="MItem"><input type="checkbox" />K5 ABS</div>
<div class="MItem"><input type="checkbox" />K5 ASA</div>
<div class="MItem"><input type="checkbox" />K5 PETG</div>
<div class="MItem"><input type="checkbox" />K5 PLA~</div>
<div class="MItem"><input type="checkbox" />K5 Silk PLA</div>
<div class="MItem"><input type="checkbox" />K5 Sparkle PLA</div>
<div class="MItem"><input type="checkbox" />K5M PLA~</div>
<div class="MItem"><input type="checkbox" />Geneic ABS</div>
<div class="MItem"><input type="checkbox" />Geneic PETG</div>
<div class="MItem"><input type="checkbox" />Geneic PLA</div>
<div class="MItem"><input type="checkbox" />Geneic TPU</div>
<div class="MItem"><input type="checkbox" />Geneic TPU83</div>
<div class="MItem"><input type="checkbox" />Geneic TPU87</div>
<div class="MItem"><input type="checkbox" />Geneic TPU90</div>
<div class="MItem"><input type="checkbox" />Geneic TPU95</div>
<div class="MItem"><input type="checkbox" />K5 ABS</div>
<div class="MItem"><input type="checkbox" />K5 ASA</div>
<div class="MItem"><input type="checkbox" />K5 PETG</div>
<div class="MItem"><input type="checkbox" />K5 PLA~</div>
<div class="MItem"><input type="checkbox" />K5 Silk PLA</div>
<div class="MItem"><input type="checkbox" />K5 Sparkle PLA</div>
<div class="MItem"><input type="checkbox" />K5M PLA~</div> -->
</div>
</div>