SweetSea/Techmino
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Used more mathematically correct symbols for app calc (#1127)

Browse Source
This commit is contained in:
C₂₉H₂₅N₃O₅
2024-07-01 09:51:14 -05:00
committed by GitHub
parent f01594b4d1
commit 4fd497fe9f
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
parts/scenes/app_calc.lua
View File

@@ -85,13 +85,13 @@ function scene.keyDown(key)
sym="+" sym="+"
elseif key=='*' then elseif key=='*' then
_autoReturn() _autoReturn()
sym="*" sym="×"
elseif key=='-' then elseif key=='-' then
_autoReturn() _autoReturn()
sym="-" sym="−"
elseif key=='/' then elseif key=='/' then
_autoReturn() _autoReturn()
sym="/" sym="÷"
elseif key:byte()>=48 and key:byte()<=57 then elseif key:byte()>=48 and key:byte()<=57 then
if sym=="=" then if sym=="=" then
val=key val=key
@@ -115,9 +115,9 @@ function scene.keyDown(key)
reg=reg:gsub("e$","") reg=reg:gsub("e$","")
val= val=
sym=="+" and tostring((tonumber(reg) or 0)+tonumber(val)) or sym=="+" and tostring((tonumber(reg) or 0)+tonumber(val)) or
sym=="-" and tostring((tonumber(reg) or 0)-tonumber(val)) or sym=="−" and tostring((tonumber(reg) or 0)-tonumber(val)) or
sym=="*" and tostring((tonumber(reg) or 0)*tonumber(val)) or sym=="×" and tostring((tonumber(reg) or 0)*tonumber(val)) or
sym=="/" and tostring((tonumber(reg) or 0)/tonumber(val)) or sym=="÷" and tostring((tonumber(reg) or 0)/tonumber(val)) or
"-1" "-1"
end end
sym="=" sym="="
@@ -158,11 +158,11 @@ scene.widgetList={
WIDGET.newKey{name='_9',x=345,y=500,w=90,sound=false,fText="9",font=50,code=pressKey'9'}, WIDGET.newKey{name='_9',x=345,y=500,w=90,sound=false,fText="9",font=50,code=pressKey'9'},
WIDGET.newKey{name='_0',x=145,y=600,w=90,sound=false,fText="0",font=50,code=pressKey'0'}, WIDGET.newKey{name='_0',x=145,y=600,w=90,sound=false,fText="0",font=50,code=pressKey'0'},
WIDGET.newKey{name='.',x=245,y=600,w=90,sound=false,fText=".",color='lM',font=50,code=pressKey'.'}, WIDGET.newKey{name='.',x=245,y=600,w=90,sound=false,fText=".",color='lM',font=50,code=pressKey'.'},
WIDGET.newKey{name='e',x=345,y=600,w=90,sound=false,fText="e",color='lM',font=50,code=pressKey'e'}, WIDGET.newKey{name='e',x=345,y=600,w=90,sound=false,fText="EE",color='lM',font=50,code=pressKey'e'},
WIDGET.newKey{name='+',x=445,y=300,w=90,sound=false,fText="+",color='lB',font=50,code=pressKey'+'}, WIDGET.newKey{name='+',x=445,y=300,w=90,sound=false,fText="+",color='lB',font=50,code=pressKey'+'},
WIDGET.newKey{name='-',x=445,y=400,w=90,sound=false,fText="-",color='lB',font=50,code=pressKey'-'}, WIDGET.newKey{name='-',x=445,y=400,w=90,sound=false,fText="−",color='lB',font=50,code=pressKey'-'},
WIDGET.newKey{name='*',x=445,y=500,w=90,sound=false,fText="*",color='lB',font=50,code=pressKey'*'}, WIDGET.newKey{name='*',x=445,y=500,w=90,sound=false,fText="×",color='lB',font=50,code=pressKey'*'},
WIDGET.newKey{name='/',x=445,y=600,w=90,sound=false,fText="/",color='lB',font=50,code=pressKey'/'}, WIDGET.newKey{name='/',x=445,y=600,w=90,sound=false,fText="÷",color='lB',font=50,code=pressKey'/'},
WIDGET.newKey{name='<',x=545,y=300,w=90,sound=false,fText=CHAR.key.backspace,color='lR',font=50,code=pressKey'backspace'}, WIDGET.newKey{name='<',x=545,y=300,w=90,sound=false,fText=CHAR.key.backspace,color='lR',font=50,code=pressKey'backspace'},
WIDGET.newKey{name='=',x=545,y=400,w=90,sound=false,fText="=",color='lY',font=50,code=pressKey'return'}, WIDGET.newKey{name='=',x=545,y=400,w=90,sound=false,fText="=",color='lY',font=50,code=pressKey'return'},
WIDGET.newKey{name='back',x=1135,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, WIDGET.newKey{name='back',x=1135,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene},