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

ENH: filament just show bundle machine

Browse source 
Change-Id: If0a35037dc4b08df7cd3aaf88662638a334196e3
(cherry picked from commit 5ebd67880a679c3013fe10b63b509761eab30670)
This commit is contained in:
zorro.zhang 2022-08-10 17:25:53 +08:00 • committed by Lane.Wei
parent 6e1e56be18
commit 2ac9267e42
4 changed files with 683 additions and 602 deletions
Download patch file Download diff file Expand all files Collapse all files

50
resources/web/guide/23/23.js
View file

@ -59,7 +59,7 @@ function SortUI()
let OneMode=m_ProfileItem["model"][n];
if( OneMode["nozzle_selected"]!="" )
ModelList.push(OneMode["model"]);
ModelList.push(OneMode);
}
//machine
@ -86,14 +86,14 @@ function SortUI()
// $('#MachineList').hide();
// }
//machine
//model
let HtmlMode='';
nMode=ModelList.length;
for(let n=0;n<nMode;n++)
{
let sModel=ModelList[n];
HtmlMode+='<div><input type="checkbox" mode="'+sModel+'" onChange="MachineClick()" />'+sModel+'</div>';
HtmlMode+='<div><input type="checkbox" mode="'+sModel['model']+'" nozzle="'+sModel['nozzle_selected']+'" onChange="MachineClick()" />'+sModel['model']+'</div>';
}
$('#MachineList .CValues').append(HtmlMode);
@ -119,14 +119,16 @@ function SortUI()
let fSelect=OneFila['selected'];
let fModel=OneFila['models']
// if(OneFila['name'].indexOf("K5 PLA Wood")>0)
// 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");
if(bCheck)
//let bCheck=$("#MachineList input:first").prop("checked");
if( fModel=='')
{
bFind=true;
}
@ -138,11 +140,20 @@ function SortUI()
{
let sOne=ModelList[m];
if(fModel.indexOf(sOne)>=0)
let OneName=sOne['model'];
let NozzleArray=sOne["nozzle_selected"].split(';');
let nNozzle=NozzleArray.length;
for( let b=0;b<nNozzle;b++ )
{
let nowModel= OneName+"++"+NozzleArray[b];
if(fModel.indexOf(nowModel)>=0)
{
bFind=true;
break;
}
}
}
}
}
@ -325,7 +336,24 @@ function SortFilament()
for(let n=0;n<nModel;n++)
{
let OneModel=pModel[n];
ModelList.push( OneModel.getAttribute("mode") );
let mName=OneModel.getAttribute("mode");
if( mName=='all' )
{
continue;
}
else
{
let mNozzle=OneModel.getAttribute("nozzle");
let NozzleArray=mNozzle.split(';');
for( let bb=0;bb<NozzleArray.length;bb++ )
{
let NewModel='['+mName+'++'+NozzleArray[bb]+']';
ModelList.push( NewModel );
}
}
}
//TypeList
@ -363,11 +391,11 @@ function SortFilament()
if(TypeList.in_array(fType) && VendorList.in_array(fVendor))
{
let HasModel=false;
for(let m=0;m<nModel;m++)
for(let m=0;m<ModelList.length;m++)
{
let ModelSrc=ModelList[m];
if( ModelSrc=="all" || fModel.indexOf(ModelSrc)>=0)
if( fModel.indexOf(ModelSrc)>=0)
{
HasModel=true;
break;