mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NEW: Ignore Nozzel Select in UserGuide 

JIRA: none
Change-Id: I507a92abb9137167dbcbe1def8276f868529c4ab
This commit is contained in:
zorro.zhang 2025-02-21 11:22:53 +08:00 committed by lane.wei
parent 9304073ecb
commit 99a8139c1b
8 changed files with 166 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
resources/web/guide/21/21.css
View File

@ -9,12 +9,13 @@
padding: 0px;
border-bottom:#00AE42 1px solid;
width: 100%;
display: flex;
justify-content:space-between;
align-items: center;
}
.BannerBtns
{
float: right;
height: 40px;
text-align: center;
margin-right: 10px;
}
@ -48,12 +49,44 @@
padding: 8px;
}
.PrinterBlock img
.PImg
{
position:relative;
background-color: #EEEEEE;
width: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;
@ -62,7 +95,7 @@
.pNozzel
{
display: flex;
display: none;
align-items: center;
justify-content:flex-start;
color: #5A5A5A;

63
resources/web/guide/21/21.js
View File

@ -1,7 +1,7 @@
function OnInit()
{
//let strInput=JSON.stringify(cData);
//HandleStudio(strInput);
//HandleModelList(cData);
TranslatePage();
@ -47,6 +47,19 @@ function ShowPrinterThumb(pItem, strImg)
$(pItem).attr('onerror',null);
}
function ChooseModel( ModelName )
{
let ChooseItem=$(".ModelCheckBox[model='"+ModelName+"']");
if(ChooseItem!=null)
{
if( $(ChooseItem).hasClass('ModelCheckBoxSelected') )
$(ChooseItem).removeClass('ModelCheckBoxSelected');
else
$(ChooseItem).addClass('ModelCheckBoxSelected');
}
}
function HandleModelList( pVal )
{
if( !pVal.hasOwnProperty("model") )
@ -71,11 +84,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,22 +106,18 @@ 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];
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 CoverImage3=pVal['configpath']+"/system/"+strVendor+"/"+OneModel['model']+"_cover.png";
//alert( 'FinalCover: '+FinalCover );
ModelHtml[strVendor]+='<div class="PrinterBlock">'+
' <div class="PImg"><img src="'+CoverImage3+'" onerror="ShowPrinterThumb(this,\''+CoverImage2+'\')" /></div>'+
' <div class="PName">'+OneModel['model']+'</div>'+ HtmlNozzel +'</div>';
'<div class="PImg">'+
'<img class="ModelThumbnail" src="'+CoverImage3+'" onerror="ShowPrinterThumb(this,\''+CoverImage2+'\')" />'+
'<div class="ModelCheckBox" model="'+OneModel['model']+'" onClick="ChooseModel(\''+OneModel['model']+'\')"><img src="../img/greencheck.svg" /></div>'+
'</div>'+
' <div class="PName">'+OneModel['model']+'</div>'+
'</div>';
}
@ -120,7 +129,6 @@ function HandleModelList( pVal )
//Update Checkbox
$('input').prop("checked", false);
for(let m=0;m<nTotal;m++)
{
let OneModel=pModel[m];
@ -128,26 +136,15 @@ 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);
}
}
else
{
$("input[vendor='"+OneModel['vendor']+"'][model='"+OneModel['model']+"']").prop("checked", false);
ChooseModel(OneModel['model']);
}
}
let AlreadySelect=$("input:checked");
let AlreadySelect=$(".ModelCheckBoxSelected");
let nSelect=AlreadySelect.length;
if(nSelect==0)
{
$("input[nozzel='0.4'][vendor='BBL']").prop("checked", true);
$("div.OneVendorBlock[vendor='"+BBL+"'] .ModelCheckBox").addClass('ModelCheckBoxSelected');
}
TranslatePage();
@ -156,13 +153,13 @@ function HandleModelList( pVal )
function SelectPrinterAll( sVendor )
{
$("input[vendor='"+sVendor+"']").prop("checked", true);
$("div.OneVendorBlock[vendor='"+sVendor+"'] .ModelCheckBox").addClass('ModelCheckBoxSelected');
}
function SelectPrinterNone( sVendor )
{
$("input[vendor='"+sVendor+"']").prop("checked", false);
$("div.OneVendorBlock[vendor='"+sVendor+"'] .ModelCheckBox").removeClass('ModelCheckBoxSelected');
}
@ -179,7 +176,7 @@ function OnExit()
{
let ModelAll={};
let ModelSelect=$("input:checked");
let ModelSelect=$(".ModelCheckBoxSelected");
let nTotal=ModelSelect.length;
if( nTotal==0 )
@ -194,8 +191,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);
@ -206,11 +201,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={};

40
resources/web/guide/21/index.html
View File

@ -23,37 +23,48 @@
<!--<div class="OneVendorBlock" Vendor="BBL">
<div class="BlockBanner">
<a>BBL-3DP</a>
<div class="BannerBtns">
<div class="SmallBtn_Green trans" onClick="SelectPrinterAll('BBL')">所有</div>
<div class="SmallBtn trans" onClick="SelectPrinterNone('BBL')">无</div>
</div>
<a>BBL-3DP</a>
</div>
<div class="PrinterArea">
<div class="PrinterBlock">
<div class="PImg"><img src="p2.jpg" /></div>
<div class="PImg">
<img class="ModelThumbnail" src="p2.jpg" />
<div class="ModelCheckBox ModelCheckBoxSelected" model="BBL-3DP-V5NORMAL" onClick="ChooseModel('BBL-3DP-V5NORMAL')"><img class="" src="../img/greencheck.svg" /></div>
</div>
<div class="PName">BBL-3DP-V4NORMAL</div>
<div class="pNozzel TextS2"><input id="ZZ" type="checkbox" model="BBL-3DP-V4NORMAL" nozzel="0.4" vendor="BBL" />0.4mm nozzle</div>
<div class="pNozzel TextS2"><input type="checkbox" model="BBL-3DP-V4NORMAL" nozzel="0.1" vendor="BBL" />0.1mm nozzle</div>
</div>
<div class="PrinterBlock">
<div class="PImg"><img src="p1.jpg" /></div>
<div class="PImg">
<img class="ModelThumbnail" src="p2.jpg" />
<div class="ModelCheckBox"><img class="" src="../img/greencheck.svg" /></div>
</div>
<div class="PName">BBL-3DP-V4NORMAL</div>
<div class="pNozzel TextS2"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.4" vendor="BBL" />0.4mm nozzle</div>
<div class="pNozzel TextS2"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.2" vendor="BBL" />0.22mm nozzle</div>
<div class="pNozzel TextS2"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.1" vendor="BBL" />0.1mm nozzle</div>
</div>
<div class="PrinterBlock">
<div class="PImg"><img src="p2.jpg" /></div>
<div class="PImg">
<img class="ModelThumbnail" src="p2.jpg" />
<div class="ModelCheckBox"><img class="" src="../img/greencheck.svg" /></div>
</div>
<div class="PName">BBL-3DP-V4NORMAL</div>
<div class="pNozzel TextS2"><input id="ZZ" type="checkbox" model="BBL-3DP-V4NORMAL" nozzel="0.4" vendor="BBL" />0.4mm nozzle</div>
<div class="pNozzel TextS2"><input type="checkbox" model="BBL-3DP-V4NORMAL" nozzel="0.1" vendor="BBL" />0.11mm nozzle</div>
</div>
<div class="PrinterBlock">
<div class="PImg"><img src="p1.jpg" /></div>
<div class="PImg">
<img class="ModelThumbnail" src="p2.jpg" />
<div class="ModelCheckBox ModelCheckBoxSelected"><img class="" src="../img/greencheck.svg" /></div>
</div>
<div class="PName">BBL-3DP-V4NORMAL</div>
<div class="pNozzel TextS2"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.4" vendor="BBL" />0.4mm nozzle</div>
<div class="pNozzel TextS2"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.2" vendor="BBL" />0.22mm nozzle</div>
@ -66,24 +77,29 @@
<div class="OneVendorBlock" Vendor="BAMBU">
<div class="BlockBanner">
<a>BAMBU-3DP</a>
<div class="BannerBtns">
<div class="Banner-Btn" onClick="SelectPrinterAll('BAMBU')">所有</div>
<div class="Banner-Btn" onClick="SelectPrinterNone('BAMBU')">无</div>
<div class="SmallBtn_Green trans" onClick="SelectPrinterAll('BAMBU')">所有</div>
<div class="SmallBtn trans" onClick="SelectPrinterNone('BAMBU')">无</div>
</div>
<a>BBL-3DP</a>
</div>
<div class="PrinterArea">
<div class="PrinterBlock">
<div class="PImg"><img src="p2.jpg" /></div>
<div class="PImg">
<img class="ModelThumbnail" src="p2.jpg" />
<div class="ModelCheckBox ModelCheckBoxSelected"><img class="" src="../img/greencheck.svg" /></div>
</div>
<div class="PName TextS1">BBL-3DP-V4NORMAL</div>
<div class="pNozzel TextS2"><input type="checkbox" model="BBL-3DP-V4NORMAL" nozzel="0.4" vendor="BAMBU" />0.4mm nozzle</div>
<div class="pNozzel TextS2"><input type="checkbox" model="BBL-3DP-V4NORMAL" nozzel="0.1" vendor="BAMBU" />0.1mm nozzle</div>
</div>
<div class="PrinterBlock">
<div class="PImg"><img src="p1.jpg" /></div>
<div class="PImg">
<img class="ModelThumbnail" src="p2.jpg" />
<div class="ModelCheckBox ModelCheckBoxSelected"><img class="" src="../img/greencheck.svg" /></div>
</div>
<div class="PName TextS1">BBL-3DP-V4NORMAL</div>
<div class="pNozzel TextS2"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.4" vendor="BAMBU" />0.4mm nozzle</div>
<div class="pNozzel TextS2"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.2" vendor="BAMBU" />0.2mm nozzle</div>

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

@ -8,13 +8,13 @@
padding: 0px;
border-bottom:#00AE42 1px solid;
width: 100%;
display: flex;
justify-content:space-between;
align-items: center;
}
.BannerBtns
{
float: right;
height: 40px;
text-align: center;
margin-right: 10px;
}
@ -48,21 +48,53 @@
padding: 8px;
}
.PrinterBlock img
.PImg
{
position:relative;
background-color: #EEEEEE;
width: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;

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

@ -46,6 +46,19 @@ function ShowPrinterThumb(pItem, strImg)
$(pItem).attr('onerror',null);
}
function ChooseModel( ModelName )
{
let ChooseItem=$(".ModelCheckBox[model='"+ModelName+"']");
if(ChooseItem!=null)
{
if( $(ChooseItem).hasClass('ModelCheckBoxSelected') )
$(ChooseItem).removeClass('ModelCheckBoxSelected');
else
$(ChooseItem).addClass('ModelCheckBoxSelected');
}
}
function HandleModelList( pVal )
{
if( !pVal.hasOwnProperty("model") )
@ -70,11 +83,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>'+
@ -92,22 +105,19 @@ 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];
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 CoverImage3=pVal['configpath']+"/system/"+strVendor+"/"+OneModel['model']+"_cover.png";
//alert( 'FinalCover: '+FinalCover );
ModelHtml[strVendor]+='<div class="PrinterBlock">'+
' <div class="PImg"><img src="'+CoverImage3+'" onerror="ShowPrinterThumb(this,\''+CoverImage2+'\')" /></div>'+
' <div class="PName">'+OneModel['model']+'</div>'+ HtmlNozzel +'</div>';
'<div class="PImg">'+
'<img class="ModelThumbnail" src="'+CoverImage3+'" onerror="ShowPrinterThumb(this,\''+CoverImage2+'\')" />'+
'<div class="ModelCheckBox" model="'+OneModel['model']+'" onClick="ChooseModel(\''+OneModel['model']+'\')"><img src="../img/greencheck.svg" /></div>'+
'</div>'+
' <div class="PName">'+OneModel['model']+'</div>'+
'</div>';
}
//Update Nozzel Html Append
@ -118,7 +128,6 @@ function HandleModelList( pVal )
//Update Checkbox
$('input').prop("checked", false);
for(let m=0;m<nTotal;m++)
{
let OneModel=pModel[m];
@ -126,26 +135,15 @@ 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);
}
}
else
{
$("input[vendor='"+OneModel['vendor']+"'][model='"+OneModel['model']+"']").prop("checked", false);
ChooseModel(OneModel['model']);
}
}
let AlreadySelect=$("input:checked");
let AlreadySelect=$(".ModelCheckBoxSelected");
let nSelect=AlreadySelect.length;
if(nSelect==0)
{
$("input[nozzel='0.4'][vendor='BBL']").prop("checked", true);
$("div.OneVendorBlock[vendor='"+BBL+"'] .ModelCheckBox").addClass('ModelCheckBoxSelected');
}
TranslatePage();
@ -154,13 +152,13 @@ function HandleModelList( pVal )
function SelectPrinterAll( sVendor )
{
$("input[vendor='"+sVendor+"']").prop("checked", true);
$("div.OneVendorBlock[vendor='"+sVendor+"'] .ModelCheckBox").addClass('ModelCheckBoxSelected');
}
function SelectPrinterNone( sVendor )
{
$("input[vendor='"+sVendor+"']").prop("checked", false);
$("div.OneVendorBlock[vendor='"+sVendor+"'] .ModelCheckBox").removeClass('ModelCheckBoxSelected');
}
@ -169,7 +167,7 @@ function OnExit()
{
let ModelAll={};
let ModelSelect=$("input:checked");
let ModelSelect=$(".ModelCheckBoxSelected");
let nTotal=ModelSelect.length;
if( nTotal==0 )
@ -184,8 +182,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);
@ -196,11 +192,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={};

1
resources/web/guide/img/greencheck.svg Normal file
View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1740057651953" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1463" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M910.222222 0a113.777778 113.777778 0 0 1 113.777778 113.777778v796.444444a113.777778 113.777778 0 0 1-113.777778 113.777778H113.777778a113.777778 113.777778 0 0 1-113.777778-113.777778V113.777778a113.777778 113.777778 0 0 1 113.777778-113.777778h796.444444z m-114.915555 320.739556a45.909333 45.909333 0 0 0-65.080889 0l-310.897778 310.897777-135.907556-135.964444a45.909333 45.909333 0 0 0-65.080888 0 45.909333 45.909333 0 0 0 0 65.137778l168.561777 168.448a45.909333 45.909333 0 0 0 65.080889 0l343.608889-343.552a45.738667 45.738667 0 0 0-0.284444-64.967111z" fill="#00AE42" p-id="1464"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 938 B

4
src/slic3r/GUI/WebGuideDialog.cpp
View File

@ -432,7 +432,7 @@ void GuideFrame::OnScriptMessage(wxWebViewEvent &evt)
wxString s1 = TmpModel["model"];
wxString s2 = OneSelect["model"];
if (s1.compare(s2) == 0) {
m_ProfileJson["model"][m]["nozzle_selected"] = OneSelect["nozzle_diameter"];
m_ProfileJson["model"][m]["nozzle_selected"] = m_ProfileJson["model"][m]["nozzle_diameter"];
break;
}
}
@ -509,7 +509,7 @@ void GuideFrame::OnScriptMessage(wxWebViewEvent &evt)
BOOST_LOG_TRIVIAL(trace) << "GuideFrame::OnScriptMessage;Error:" << e.what();
}
//wxString strAll = m_ProfileJson.dump(-1,' ',false, json::error_handler_t::ignore);
wxString strAll = m_ProfileJson.dump(-1,' ',false, json::error_handler_t::ignore);
}
void GuideFrame::RunScript(const wxString &javascript)

6
src/slic3r/GUI/WebViewDialog.cpp
View File

@ -1004,11 +1004,9 @@ std::string UrlEncode( const std::string &input )
escaped.fill('0');
escaped << std::hex;
for (char c : input) {
// 如果字符是字母、数字、'-'、'.'、'_' 或 '~'，则直接添加到结果中
if (std::isalnum(c) || c == '-' || c == '.' || c == '_' || c == '~') {
escaped << c;
} else {
// 对于其他字符，将其转换为 %XX 的形式
escaped << '%' << std::setw(2) << static_cast<int>(static_cast<unsigned char>(c));
}
}
@ -1215,7 +1213,7 @@ void WebViewPanel::update_mode()
*/
void WebViewPanel::OnNavigationRequest(wxWebViewEvent& evt)
{
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << ": " << evt.GetTarget().ToUTF8().data();
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << ": " << evt.GetURL().ToUTF8().data();
const wxString &url = evt.GetURL();
if (url.StartsWith("File://") || url.StartsWith("file://")) {
if (!url.Contains("/web/homepage3/")) {
@ -1301,7 +1299,7 @@ void WebViewPanel::OnNavigationComplete(wxWebViewEvent& evt)
//m_browser->Show();
Layout();
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << ": " << evt.GetTarget().ToUTF8().data();
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << ": " << evt.GetURL().ToUTF8().data();
if (wxGetApp().get_mode() == comDevelop)
wxLogMessage("%s", "Navigation complete; url='" + evt.GetURL() + "'");
UpdateState();