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

NEW: Ignore Nozzel Select in UserGuide

Browse Source 
JIRA: none
Change-Id: I507a92abb9137167dbcbe1def8276f868529c4ab
(cherry picked from commit 99a8139c1b915709a854296f22a222bac07a47ce)
This commit is contained in:
zorro.zhang
2025-02-21 11:22:53 +08:00
committed by Noisyfox
parent 12226c472b
commit adf85c5080
8 changed files with 242 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
resources/web/guide/24/24.css
View File

@@ -9,17 +9,17 @@
padding: 0px;
border-bottom:#009688 1px solid;
width: 100%;
display: flex;
justify-content:space-between;
align-items: center;
}
.BannerBtns
{
float: right;
display: flex;
white-space: nowrap;
justify-content: space-around;
align-items: center;
height: 40px;
text-align: center;
margin-right: 0px; /* ORCA align buttons with end of horizontal separator/line */
}
@@ -76,21 +76,52 @@
padding: 10px;
}
.PrinterBlock img
.PImg
{
position:relative;
width:160px;
height: 160px;
height: 160px;
}
.ModelCheckBox
{
position: absolute;
width: 20px;
height: 20px;
right: 10px;
top: 10px;
border:1px solid #ADADAD;
background-color: #FFF;
padding: 1px;
cursor: pointer;
}
.ModelCheckBox.ModelCheckBoxSelected img
{
display:inline;
}
.ModelCheckBox img
{
width:100%;
display: none;
}
img.ModelThumbnail
{
width: 100%;
height: 100%;
}
.PName
{
font-weight: 700;
text-align:left;
text-align: left;
}
.pNozzel
{
display: flex;
display: none;
align-items: center;
justify-content:flex-start;
color: #5A5A5A;

173
resources/web/guide/24/24.js
View File

@@ -1,7 +1,7 @@
function OnInit()
{
//let strInput=JSON.stringify(cData);
//HandleStudio(strInput);
//HandleModelList(cData);
TranslatePage();
@@ -46,6 +46,21 @@ function ShowPrinterThumb(pItem, strImg)
$(pItem).attr('onerror',null);
}
function ChooseModel( vendor, ModelName )
{
let ChooseItem=$(".ModelCheckBox[vendor='"+vendor+"'][model='"+ModelName+"']");
if(ChooseItem!=null)
{
if( $(ChooseItem).hasClass('ModelCheckBoxSelected') )
$(ChooseItem).removeClass('ModelCheckBoxSelected');
else
$(ChooseItem).addClass('ModelCheckBoxSelected');
SetModelSelect(vendor, ModelName, $(ChooseItem).hasClass('ModelCheckBoxSelected'));
}
}
function HandleModelList( pVal )
{
if( !pVal.hasOwnProperty("model") )
@@ -66,7 +81,7 @@ function HandleModelList( pVal )
{
let sVV=strVendor;
if( sVV=="BBL" )
sVV="Bambu Lab";
sVV="Bambu Lab";
if( sVV=="Custom")
sVV="Custom Printer";
if( sVV=="Other")
@@ -74,11 +89,11 @@ function HandleModelList( pVal )
let HtmlNewVendor='<div class="OneVendorBlock" Vendor="'+strVendor+'">'+
'<div class="BlockBanner">'+
' <a>'+sVV+'</a>'+
' <div class="BannerBtns">'+
' <div class="SmallBtn_Green trans" tid="t11" onClick="SelectPrinterAll('+"\'"+strVendor+"\'"+')">all</div>'+
' <div class="SmallBtn trans" tid="t12" onClick="SelectPrinterNone('+"\'"+strVendor+"\'"+')">none</div>'+
' </div>'+
' <a>'+sVV+'</a>'+
'</div>'+
'<div class="PrinterArea"> '+
'</div>'+
@@ -93,19 +108,14 @@ function HandleModelList( pVal )
if( !ModelHtml.hasOwnProperty(strVendor))
ModelHtml[strVendor]='';
let NozzleArray=OneModel['nozzle_diameter'].split(';');
let HtmlNozzel='';
for(let m=0;m<NozzleArray.length;m++)
{
let nNozzel=NozzleArray[m];
/* ORCA use label tag to allow checkbox to toggle when user ckicked to text */
HtmlNozzel += '<label class="pNozzel TextS2"><input type="checkbox" model="' + OneModel['model'] + '" nozzel="' + nNozzel + '" vendor="' + strVendor +'" onclick="CheckBoxOnclick(this)" /><span>'+nNozzel+'</span><span class="trans" tid="t13">mm nozzle</span></label>';
}
let CoverImage=OneModel['cover'];
ModelHtml[strVendor]+='<div class="PrinterBlock">'+
' <div class="PImg"><img src="'+CoverImage+'" /></div>'+
' <div class="PName">'+OneModel['name']+'</div>'+ HtmlNozzel +'</div>';
ModelHtml[strVendor]+='<div class="PrinterBlock" onClick="ChooseModel(\''+strVendor+'\',\''+OneModel['model']+'\')">'+
'<div class="PImg">'+
'<img class="ModelThumbnail" src="'+CoverImage+'" />'+
'<div class="ModelCheckBox" vendor="' +strVendor+ '" model="'+OneModel['model']+'"><img src="../img/greencheck.svg" /></div>'+
'</div>'+
' <div class="PName">'+OneModel['name']+'</div>'+
'</div>';
}
//Update Nozzel Html Append
@@ -116,7 +126,6 @@ function HandleModelList( pVal )
//Update Checkbox
$('input').prop("checked", false);
for(let m=0;m<nTotal;m++)
{
let OneModel=pModel[m];
@@ -124,45 +133,21 @@ function HandleModelList( pVal )
let SelectList=OneModel['nozzle_selected'];
if(SelectList!='')
{
SelectList=OneModel['nozzle_selected'].split(';');
let nLen=SelectList.length;
for(let a=0;a<nLen;a++)
{
let nNozzel=SelectList[a];
$("input[vendor='" + OneModel['vendor'] + "'][model='" + OneModel['model'] + "'][nozzel='" + nNozzel + "']").prop("checked", true);
SetModelSelect(OneModel['vendor'], OneModel['model'], nNozzel, true);
}
}
else
{
$("input[vendor='"+OneModel['vendor']+"'][model='"+OneModel['model']+"']").prop("checked", false);
ChooseModel(OneModel['vendor'], OneModel['model']);
}
}
// let AlreadySelect=$("input:checked");
// let AlreadySelect=$(".ModelCheckBoxSelected");
// let nSelect=AlreadySelect.length;
// if(nSelect==0)
// {
// $("input[nozzel='0.4'][vendor='Custom']").prop("checked", true);
// $("div.OneVendorBlock[vendor='"+BBL+"'] .ModelCheckBox").addClass('ModelCheckBoxSelected');
// }
TranslatePage();
}
function CheckBoxOnclick(obj) {
let strModel = obj.getAttribute("model");
let strVendor = obj.getAttribute("vendor");
let strNozzel = obj.getAttribute("nozzel");
SetModelSelect(strVendor, strModel, strNozzel, obj.checked);
}
function SetModelSelect(vendor, model, nozzel, checked) {
function SetModelSelect(vendor, model, checked) {
if (!ModelNozzleSelected.hasOwnProperty(vendor) && !checked) {
return;
}
@@ -172,17 +157,12 @@ function SetModelSelect(vendor, model, nozzel, checked) {
}
let oVendor = ModelNozzleSelected[vendor];
if (!oVendor.hasOwnProperty(model)) {
oVendor[model] = {};
}
let oModel = oVendor[model];
if (oModel.hasOwnProperty(nozzel) || checked) {
oVendor[model][nozzel] = checked;
if (oVendor.hasOwnProperty(model) || checked) {
oVendor[model] = checked;
}
}
function GetModelSelect(vendor, model, nozzel) {
function GetModelSelect(vendor, model) {
if (!ModelNozzleSelected.hasOwnProperty(vendor)) {
return false;
}
@@ -192,27 +172,21 @@ function GetModelSelect(vendor, model, nozzel) {
return false;
}
let oModel = oVendor[model];
if (!oModel.hasOwnProperty(nozzel)) {
return false;
}
return oVendor[model][nozzel];
return oVendor[model];
}
function FilterModelList(keyword) {
//Save checkbox state
let ModelSelect = $('input[type=checkbox]');
let ModelSelect = $('.ModelCheckBox');
for (let n = 0; n < ModelSelect.length; n++) {
let OneItem = ModelSelect[n];
let strModel = OneItem.getAttribute("model");
let strVendor = OneItem.getAttribute("vendor");
let strNozzel = OneItem.getAttribute("nozzel");
SetModelSelect(strVendor, strModel, strNozzel, OneItem.checked);
SetModelSelect(strVendor, strModel, $(OneItem).hasClass('ModelCheckBoxSelected'));
}
let nTotal = pModel.length;
@@ -241,11 +215,11 @@ function FilterModelList(keyword) {
let HtmlNewVendor = '<div class="OneVendorBlock" Vendor="' + strVendor + '">' +
'<div class="BlockBanner">' +
' <a>' + sVV + '</a>' +
' <div class="BannerBtns">' +
' <div class="SmallBtn_Green trans" tid="t11" onClick="SelectPrinterAll(' + "\'" + strVendor + "\'" + ')">all</div>' +
' <div class="SmallBtn trans" tid="t12" onClick="SelectPrinterNone(' + "\'" + strVendor + "\'" + ')">none</div>' +
' </div>' +
' <a>' + sVV + '</a>' +
'</div>' +
'<div class="PrinterArea"> ' +
'</div>' +
@@ -258,18 +232,14 @@ function FilterModelList(keyword) {
if (!ModelHtml.hasOwnProperty(strVendor))
ModelHtml[strVendor] = '';
let NozzleArray = OneModel['nozzle_diameter'].split(';');
let HtmlNozzel = '';
for (let m = 0; m < NozzleArray.length; m++) {
let nNozzel = NozzleArray[m];
/* ORCA use label tag to allow checkbox to toggle when user ckicked to text */
HtmlNozzel += '<label class="pNozzel TextS2"><input type="checkbox" model="' + OneModel['model'] + '" nozzel="' + nNozzel + '" vendor="' + strVendor + '" onclick="CheckBoxOnclick(this)" /><span>' + nNozzel + '</span><span class="trans" tid="t13">mm nozzle</span></label>';
}
let CoverImage = OneModel['cover'];
ModelHtml[strVendor] += '<div class="PrinterBlock">' +
' <div class="PImg"><img src="' + CoverImage + '" /></div>' +
' <div class="PName">' + OneModel['name'] + '</div>' + HtmlNozzel + '</div>';
ModelHtml[strVendor] += '<div class="PrinterBlock" onClick="ChooseModel(\''+strVendor+'\',\''+OneModel['model']+'\')">'+
'<div class="PImg">'+
'<img class="ModelThumbnail" src="'+CoverImage+'" />'+
'<div class="ModelCheckBox" vendor="' +strVendor+ '" model="'+OneModel['model']+'"><img src="../img/greencheck.svg" /></div>'+
'</div>'+
' <div class="PName">'+OneModel['name']+'</div>'+
'</div>';
}
//Update Nozzel Html Append
@@ -281,24 +251,26 @@ function FilterModelList(keyword) {
//Update Checkbox
ModelSelect = $('input[type=checkbox]');
ModelSelect = $('.ModelCheckBox');
for (let n = 0; n < ModelSelect.length; n++) {
let OneItem = ModelSelect[n];
let strModel = OneItem.getAttribute("model");
let strVendor = OneItem.getAttribute("vendor");
let strNozzel = OneItem.getAttribute("nozzel");
let checked = GetModelSelect(strVendor, strModel, strNozzel);
let checked = GetModelSelect(strVendor, strModel);
OneItem.checked = checked;
if (checked)
$(OneItem).addClass('ModelCheckBoxSelected');
else
$(OneItem).removeClass('ModelCheckBoxSelected');
}
// let AlreadySelect=$("input:checked");
// let AlreadySelect=$(".ModelCheckBoxSelected");
// let nSelect=AlreadySelect.length;
// if(nSelect==0)
// {
// $("input[nozzel='0.4'][vendor='Custom']").prop("checked", true);
// $("div.OneVendorBlock[vendor='"+BBL+"'] .ModelCheckBox").addClass('ModelCheckBoxSelected');
// }
TranslatePage();
@@ -306,18 +278,20 @@ function FilterModelList(keyword) {
function SelectPrinterAll( sVendor )
{
$("input[vendor='"+sVendor+"']").prop("checked", true);
$("input[vendor='"+sVendor+"']").each(function() {
CheckBoxOnclick(this);
$("div.OneVendorBlock[vendor='"+sVendor+"'] .ModelCheckBox").addClass('ModelCheckBoxSelected');
$("div.OneVendorBlock[vendor='"+sVendor+"'] .ModelCheckBox").each(function() {
let strModel = this.getAttribute("model");
SetModelSelect(sVendor, strModel, true);
});
}
function SelectPrinterNone( sVendor )
{
$("input[vendor='"+sVendor+"']").prop("checked", false);
$("input[vendor='"+sVendor+"']").each(function() {
CheckBoxOnclick(this);
$("div.OneVendorBlock[vendor='"+sVendor+"'] .ModelCheckBox").removeClass('ModelCheckBoxSelected');
$("div.OneVendorBlock[vendor='"+sVendor+"'] .ModelCheckBox").each(function() {
let strModel = this.getAttribute("model");
SetModelSelect(sVendor, strModel, false);
});
}
@@ -327,25 +301,18 @@ function OnExitFilter() {
let ModelAll = {};
for (vendor in ModelNozzleSelected) {
for (model in ModelNozzleSelected[vendor]) {
for (nozzel in ModelNozzleSelected[vendor][model]) {
if (!ModelNozzleSelected[vendor][model][nozzel])
continue;
if (!ModelNozzleSelected[vendor][model])
continue;
if (!ModelAll.hasOwnProperty(model)) {
//alert("ADD: "+strModel);
if (!ModelAll.hasOwnProperty(model)) {
//alert("ADD: "+strModel);
ModelAll[model] = {};
ModelAll[model] = {};
ModelAll[model]["model"] = model;
ModelAll[model]["nozzle_diameter"] = '';
ModelAll[model]["vendor"] = vendor;
}
ModelAll[model]["nozzle_diameter"] += ModelAll[model]["nozzle_diameter"] == '' ? nozzel : ';' + nozzel;
nTotal++;
ModelAll[model]["model"] = model;
}
nTotal++;
}
}
@@ -365,7 +332,7 @@ function OnExit()
{
let ModelAll={};
let ModelSelect=$("input:checked");
let ModelSelect=$(".ModelCheckBoxSelected");
let nTotal=ModelSelect.length;
if( nTotal==0 )
@@ -380,8 +347,6 @@ function OnExit()
let OneItem=ModelSelect[n];
let strModel=OneItem.getAttribute("model");
let strVendor=OneItem.getAttribute("vendor");
let strNozzel=OneItem.getAttribute("nozzel");
//alert(strModel+strVendor+strNozzel);
@@ -392,11 +357,7 @@ function OnExit()
ModelAll[strModel]={};
ModelAll[strModel]["model"]=strModel;
ModelAll[strModel]["nozzle_diameter"]='';
ModelAll[strModel]["vendor"]=strVendor;
}
ModelAll[strModel]["nozzle_diameter"]+=ModelAll[strModel]["nozzle_diameter"]==''?strNozzel:';'+strNozzel;
}
var tSend={};