Skip to content

converted memstore to state object #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DrakeDwornik merged 1 commit into from
Oct 31, 2021
Merged

converted memstore to state object #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions main_app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,11 @@ def screen_options():

elif Operation == 14:
print("Inverse Tangent")
raddeg = int(input("For Radians: Enter 1; For Degrees: Enter 2: "))
raddeg = state.degrees
if raddeg == 1:
print("Enter an angle in Radians to find Inverse Tangent: ")
x = enter_num()
result = calc.inverse_tangent(x)
result = calc.inverse_tangent(state.result)
return result
elif raddeg == 2:
print("Enter an angle in Degrees to find Inverse Tangent: ")
Expand All @@ -195,24 +195,24 @@ def screen_options():

elif Operation == 15:
print("M+")
memStore = float(input("Enter a number to store: "))
print(memStore)
return memStore
state.stored_number = float(input("Enter a number to store: "))
print(state.stored_number)
return state.stored_number

elif Operation == 16:
print("MC")
if type(memStore) != None:
print(memStore)
if type(state.stored_number) != None:
print(state.stored_number)

elif Operation == 17:
print("MCR")
store_choice = (input("Do you want to clear memory? Y or N: ")).capitalize()
if store_choice == "Y":
memStore = 0
state.stored_number= 0
else:
pass
print(memStore)
return memStore
print(state.stored_number)
return state.stored_number

elif Operation == 18:
condi = False
Expand Down