diff --git a/src/service/add_service.py b/src/service/add_service.py new file mode 100644 index 0000000..0fb5708 --- /dev/null +++ b/src/service/add_service.py @@ -0,0 +1,6 @@ + + +def add(string): + arguments = string.split("+") + result = int(arguments[0]) + int(arguments[1]) + return result diff --git a/src/service/calculation_service.py b/src/service/calculation_service.py index 4b3e905..0d6d3b3 100644 --- a/src/service/calculation_service.py +++ b/src/service/calculation_service.py @@ -1,7 +1,7 @@ """Module for the CalculationService class""" from tkinter import StringVar import divide_service as divide_service - +import add_service as add_service class CalculationService: """""Class for keeping track of, and evaluating calculations""""" @@ -29,10 +29,12 @@ def equalpress(self): try: # evaluate the expression/calculation - if "/" not in self.expression: - total = str(eval(self.expression)) - else: + if "/" in self.expression: total = str(divide_service.divide(self.expression)) + if "+" in self.expression: + total = str(add_service.add(self.expression)) + else: + total = str(eval(self.expression)) if float(total) > 10: total = total + " <:o)"