amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

NEW: add model Depot Button

Browse source 
Change-Id: I64f3e54dab3cd66b400d7dc1519f3ce84eba2fae
(cherry picked from commit 84e964bdd8eb63347a3fefcefe82c9cae6e52c5f)
This commit is contained in:
zorro.zhang 2022-10-25 14:44:51 +08:00 committed by Lane.Wei
parent ca9d1ad4ae
commit 9ec439c8f5
8 changed files with 62 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/web/data/text.js
View file

@ -81,7 +81,9 @@ var LangText={
"t86":"Close",
"t87":"User Manual",
"t88":"Remove",
"t89":"Open Containing Folder"
"t89":"Open Containing Folder",
"t90":"3D Model",
"t91":"Download 3D Models"
},
"zh_CN":{
"t1":"欢迎使用Bambu Studio",
@ -166,6 +168,8 @@ var LangText={
"t87":"使用引导",
"t88":"移除",
"t89":"打开所在的文件夹",
"t90":"3D 模型",
"t91":"下载3D模型",
"wk1":"快速入门指南",
"wk2":"本文介绍了Bambu Studio的最基本用法。它指导用户配置软件，创建项目，并逐步完成第一个打印任务。",
"wk3":"基于项目的工作流",

25
resources/web/guide/22/22.js
View file

@ -116,6 +116,8 @@ function SortUI()
{
let OneFila=m_ProfileItem['filament'][key];
//alert(JSON.stringify(OneFila));
let fWholeName=OneFila['name'].trim();
let fShortName=GetFilamentShortname( OneFila['name'] );
let fVendor=OneFila['vendor'];
@ -123,6 +125,8 @@ 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 )
@ -188,15 +192,6 @@ function SortUI()
let HtmlFila='<div class="MItem"><input type="checkbox" vendor="'+fVendor+'" filatype="'+fType+'" filalist="'+fWholeName+';'+'" model="'+fModel+'" name="'+fShortName+'" />'+fShortName+'</div>';
$("#ItemBlockArea").append(HtmlFila);
if(fSelect==1)
{
$("#ItemBlockArea input[vendor='"+fVendor+"'][filatype='"+fType+"'][name='"+fShortName+"']").prop("checked",true);
SelectNumber++;
}
// else
// $("#ItemBlockArea input[vendor='"+fVendor+"'][model='"+fModel+"'][filatype='"+fType+"'][name='"+key+"']").prop("checked",false);
}
else
{
@ -206,8 +201,18 @@ function SortUI()
pFila.attr("model", strModel+fModel);
pFila.attr("filalist", strFilalist+fWholeName+';');
}
if(fSelect*1==1)
{
//alert( fWholeName+' - '+fShortName+' - '+fVendor+' - '+fType+' - '+fSelect+' - '+fModel );
$("#ItemBlockArea input[vendor='"+fVendor+"'][filatype='"+fType+"'][name='"+fShortName+"']").prop("checked",true);
SelectNumber++;
}
// else
// $("#ItemBlockArea input[vendor='"+fVendor+"'][model='"+fModel+"'][filatype='"+fType+"'][name='"+key+"']").prop("checked",false);
}
}
}
//Sort TypeArray
let TypeAdvNum=FilamentPriority.length;

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

@ -113,12 +113,17 @@ function SortUI()
{
let OneFila=m_ProfileItem['filament'][key];
//alert(JSON.stringify(OneFila));
let fWholeName=OneFila['name'].trim();
let fShortName=GetFilamentShortname( OneFila['name'] );
let fVendor=OneFila['vendor'];
let fType=OneFila['type'];
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 )
@ -149,9 +154,9 @@ function SortUI()
{
let nowModel= OneName+"++"+NozzleArray[b];
if(fModel.indexOf(nowModel)>=0)
{
bFind=true;
break;
{
bFind=true;
break;
}
}
}
@ -173,7 +178,7 @@ function SortUI()
if(!VendorHtmlArray.hasOwnProperty(lowVendor))
{
let HtmlVendor='<div><input type="checkbox" vendor="'+fVendor+'" onChange="VendorClick()" />'+fVendor+'</div>';
VendorHtmlArray[lowVendor]=HtmlVendor;
}
@ -181,27 +186,30 @@ function SortUI()
let pFila=$("#ItemBlockArea input[vendor='"+fVendor+"'][filatype='"+fType+"'][name='"+fShortName+"']");
if(pFila.length==0)
{
let HtmlFila='<div class="MItem"><input type="checkbox" vendor="'+fVendor+'" filatype="'+fType+'" model="'+fModel+'" name="'+fShortName+'" />'+fShortName+'</div>';
let HtmlFila='<div class="MItem"><input type="checkbox" vendor="'+fVendor+'" filatype="'+fType+'" filalist="'+fWholeName+';'+'" model="'+fModel+'" name="'+fShortName+'" />'+fShortName+'</div>';
$("#ItemBlockArea").append(HtmlFila);
if(fSelect==1)
{
$("#ItemBlockArea input[vendor='"+fVendor+"'][filatype='"+fType+"'][name='"+fShortName+"']").prop("checked",true);
SelectNumber++;
}
// else
// $("#ItemBlockArea input[vendor='"+fVendor+"'][model='"+fModel+"'][filatype='"+fType+"'][name='"+key+"']").prop("checked",false);
}
else
else
{
let strModel=pFila.attr("model");
let strFilalist=pFila.attr("filalist");
pFila.attr("model", strModel+fModel);
pFila.attr("filalist", strFilalist+fWholeName+';');
}
if(fSelect*1==1)
{
//alert( fWholeName+' - '+fShortName+' - '+fVendor+' - '+fType+' - '+fSelect+' - '+fModel );
$("#ItemBlockArea input[vendor='"+fVendor+"'][filatype='"+fType+"'][name='"+fShortName+"']").prop("checked",true);
SelectNumber++;
}
// else
// $("#ItemBlockArea input[vendor='"+fVendor+"'][model='"+fModel+"'][filatype='"+fType+"'][name='"+key+"']").prop("checked",false);
}
}
}
//Sort TypeArray
let TypeAdvNum=FilamentPriority.length;

BIN
resources/web/homepage/img/i6.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
resources/web/homepage/img/project_based_workflow.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 57 KiB

7
resources/web/homepage/index.html
View file

@ -50,6 +50,13 @@
<div id="ContentBoard" board="recent">
<div style="height: 14px;"></div>
<div id="MenuArea">
<div class="MenuItem" onClick="OnClickModelDepot()">
<div class="MenuIcon"><img src="img/i6.png"></div>
<div>
<div class="trans" tid="t90">3D Model</div>
<div class="MenuDesc trans" tid="t91">Download 3D Models</div>
</div>
</div>
<div class="MenuItem" onClick="OnClickNewProject()">
<div class="MenuIcon"><img src="img/i4.png"></div>
<div>

8
resources/web/homepage/js/home.js
View file

@ -252,6 +252,14 @@ function OnLoginOrRegister()
SendWXMessage( JSON.stringify(tSend) );
}
function OnClickModelDepot()
{
var tSend={};
tSend['sequence_id']=Math.round(new Date() / 1000);
tSend['command']="homepage_modeldepot";
SendWXMessage( JSON.stringify(tSend) );
}
function OnClickNewProject()
{

3
src/slic3r/GUI/GUI_App.cpp
View file

@ -3237,6 +3237,9 @@ std::string GUI_App::handle_web_request(std::string cmd)
CallAfter([this] {
wxGetApp().request_user_logout();
});
}
else if (command_str.compare("homepage_modeldepot") == 0) {
}
else if (command_str.compare("homepage_newproject") == 0) {
this->request_open_project("<new>");