From 2d644abac16ed1b4e262b52871f19f00de15a1d3 Mon Sep 17 00:00:00 2001 From: bangrezz Date: Fri, 12 Feb 2021 11:14:25 +0800 Subject: [PATCH 01/29] add __init__.py file --- modules/PlaneGeometry/Circle/__init__.py | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 modules/PlaneGeometry/Circle/__init__.py diff --git a/modules/PlaneGeometry/Circle/__init__.py b/modules/PlaneGeometry/Circle/__init__.py new file mode 100644 index 0000000..0e4119b --- /dev/null +++ b/modules/PlaneGeometry/Circle/__init__.py @@ -0,0 +1,2 @@ +"""Circle modules +""" \ No newline at end of file From ee6d0ded53baad6c265fecf451e64af458c875b9 Mon Sep 17 00:00:00 2001 From: bangrezz Date: Sun, 14 Feb 2021 09:26:08 +0800 Subject: [PATCH 02/29] update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 090e5dd..ff6fe92 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ python3 geometry_calc.py ## Note 1. The units displayed don't affect the calculation results. it's just a view. -2. Available shapes : +2. Available geometry shapes : - Plane geometry - rectangle - square From aedee990b2c479d23609f2b55f3254163923a984 Mon Sep 17 00:00:00 2001 From: bangrezz Date: Sun, 14 Feb 2021 09:30:39 +0800 Subject: [PATCH 03/29] update README --- modules/about.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/about.py b/modules/about.py index 519f606..6fba8fb 100644 --- a/modules/about.py +++ b/modules/about.py @@ -55,7 +55,7 @@ def printabout(): ## Note 1. The units displayed don't affect the calculation results. it's just a view. -2. Available shapes : +2. Available geometry shapes : - Plane geometry - rectangle - square From 2152bcb32c0a5cafcd638734ba73208f5b4fc5cc Mon Sep 17 00:00:00 2001 From: bangrezz Date: Sun, 14 Feb 2021 11:10:36 +0800 Subject: [PATCH 04/29] Added calculate.py --- modules/PlaneGeometry/Circle/calculate.py | 40 +++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 modules/PlaneGeometry/Circle/calculate.py diff --git a/modules/PlaneGeometry/Circle/calculate.py b/modules/PlaneGeometry/Circle/calculate.py new file mode 100644 index 0000000..9aa3922 --- /dev/null +++ b/modules/PlaneGeometry/Circle/calculate.py @@ -0,0 +1,40 @@ +#module for calculate area & circumference circle + +class Circle: + def __init__(self, radius, PI): + self.r = radius + self.PI = PI + + def Calculating_Area(self): + global area + area = self.PI * self.r ** 2 + return area + + def Calculating_Circumference(self): + global perimeter + perimeter = 2 * self.PI * self.r + return perimeter + + def Result(self): + res = f"""\n + ---------------------------------------------- + CALCULATE + ---------------------------------------------- + + Radius (r) = {self.r} cm + + Pi value (π) = {self.PI} + + Formula the circle perimeter = 2 * π * r + = 2 * {self.PI} * {self.r} cm + + Formula the circle area = π * r^2 + = {self.PI} * ({self.r})^2 cm + + --------------------RESULT-------------------- + + Circle perimeter = {perimeter} cm + + Cirle area = {area} cm^2 + """ + return res \ No newline at end of file From 6560da2065e2ba84b386a31462aed167f8689459 Mon Sep 17 00:00:00 2001 From: bangrezz Date: Sun, 14 Feb 2021 11:11:29 +0800 Subject: [PATCH 05/29] Added execute.py --- modules/PlaneGeometry/Circle/execute.py | 53 +++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 modules/PlaneGeometry/Circle/execute.py diff --git a/modules/PlaneGeometry/Circle/execute.py b/modules/PlaneGeometry/Circle/execute.py new file mode 100644 index 0000000..8f57b74 --- /dev/null +++ b/modules/PlaneGeometry/Circle/execute.py @@ -0,0 +1,53 @@ +# module for execute area & perimeter circle +from os import system, name +from modules.PlaneGeometry.Circle.calculate import Circle +from modules.banners import circle_banner +from modules.wannaquit import question + +def clear(): + # for windows + if name == 'nt': + _ = system('cls') + # for mac and linux(here, os.name is 'posix') + else: + _ = system('clear') + +def Execute_Circle(): + clear() + circle_banner() + print("Calculate area and circumference of the circle") + #initiating + def Input_radius(): #input side length + try: + global radius + radius = float(input("\nEnter radius length (r) = ")) + if radius <= 0:print("[ERROR] The value must greater than 0 !");Input_radius() + except ValueError: + print("[ERROR] Enter again !") + Input_radius() + except KeyboardInterrupt: + print("\n\nThank you for using Geometry Calc :)") + exit() + Input_radius() + def Input_pi(): + try: + global PI + # select pi value + select_pi = input("\nUsing pi (π) default value : 3.14 ? [y/n] = ") + if select_pi == 'y':PI = 3.14 # set default pi value to 3.14 + elif select_pi == 'n': + print("""\n\n[NOTE] pi value must 3.14. But, you can custom decimal value of pi. +Example : 3.14159""") + PI = float(input("\nEnter custom pi value (π) = ")) + else:print("\n[ERROR] Please enter correctly");Input_pi() + except ValueError: + print("[ERROR] Enter again !") + Input_pi() + except KeyboardInterrupt: + print("\n\nThank you for using Geometry Calc :)") + exit() + Input_pi() + ExecCircle = Circle(radius,PI) + ExecCircle.Calculating_Area();ExecCircle.Calculating_Circumference() + result = ExecCircle.Result();print(result) + question() \ No newline at end of file From 46971d9bd4872b137717eb95ff8fa7c64d4fb10c Mon Sep 17 00:00:00 2001 From: bangrezz Date: Sun, 14 Feb 2021 11:13:53 +0800 Subject: [PATCH 06/29] Added circle banner and circle list at PlaneGeo_banner --- modules/banners.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/banners.py b/modules/banners.py index 7f33c18..fe380a1 100644 --- a/modules/banners.py +++ b/modules/banners.py @@ -51,6 +51,7 @@ def PlaneGeo_banner(): 1. Square 2. Rectangle 3. Triangle + 4. Circle 99. Go back to the previous menu """ @@ -131,6 +132,12 @@ def rectangle_banner(): print(colorama.Fore.LIGHTMAGENTA_EX, textbanner) # set textbanner color print(colorama.Fore.RESET) #for reset color to default +def circle_banner(): + fontsbanner = Figlet(font='slant') + textbanner = (fontsbanner.renderText("Circle")) + print(colorama.Fore.LIGHTMAGENTA_EX, textbanner) # set textbanner color + print(colorama.Fore.RESET) #for reset color to default + """ Solid Geometry banners | V From ca803a6736f8fec7dfd1daf893443d9a01c83a85 Mon Sep 17 00:00:00 2001 From: bangrezz Date: Sun, 14 Feb 2021 11:22:05 +0800 Subject: [PATCH 07/29] Improve grammar --- modules/PlaneGeometry/Circle/execute.py | 2 +- modules/PlaneGeometry/Rectangle/execute.py | 2 +- modules/PlaneGeometry/Square/execute.py | 2 +- modules/PlaneGeometry/Triangle/execute.py | 5 ++--- modules/SolidGeometry/Cube/execute.py | 2 +- modules/SolidGeometry/RectangularPrism/execute.py | 2 +- modules/SolidGeometry/Sphere/execute.py | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/PlaneGeometry/Circle/execute.py b/modules/PlaneGeometry/Circle/execute.py index 8f57b74..6838027 100644 --- a/modules/PlaneGeometry/Circle/execute.py +++ b/modules/PlaneGeometry/Circle/execute.py @@ -1,4 +1,4 @@ -# module for execute area & perimeter circle +# module for execute area & circumference circle from os import system, name from modules.PlaneGeometry.Circle.calculate import Circle from modules.banners import circle_banner diff --git a/modules/PlaneGeometry/Rectangle/execute.py b/modules/PlaneGeometry/Rectangle/execute.py index cb0a48b..60ae0a9 100644 --- a/modules/PlaneGeometry/Rectangle/execute.py +++ b/modules/PlaneGeometry/Rectangle/execute.py @@ -16,7 +16,7 @@ def clear(): def Execute_Rectangle(): clear() rectangle_banner() - print("Calculate Rectangle Area & Perimeter") + print("Calculate area and perimeter of the rectangle") #initiating def Input_length(): try: diff --git a/modules/PlaneGeometry/Square/execute.py b/modules/PlaneGeometry/Square/execute.py index b621440..66f956a 100644 --- a/modules/PlaneGeometry/Square/execute.py +++ b/modules/PlaneGeometry/Square/execute.py @@ -15,7 +15,7 @@ def clear(): def Execute_Square(): clear() square_banner() - print("Calculate Square Area & Perimeter") + print("Calculate area and perimeter of the square") #initiating def Input_side(): #input side length try: diff --git a/modules/PlaneGeometry/Triangle/execute.py b/modules/PlaneGeometry/Triangle/execute.py index 1cf4d51..4c08d7b 100644 --- a/modules/PlaneGeometry/Triangle/execute.py +++ b/modules/PlaneGeometry/Triangle/execute.py @@ -15,8 +15,7 @@ def clear(): def Execute_Area(): clear() - print("Calculate Triangle Area") - #initiating + print("Calculate area of the triangle") def Input_Base(): #input base length try: global Base @@ -50,7 +49,7 @@ def Input_Height(): #input height length def Execute_Perimeter(): clear() - print("Calculate Triangle Perimeter") + print("Calculate perimeter of the triangle") #initiating def Input_side_a(): #side a try: diff --git a/modules/SolidGeometry/Cube/execute.py b/modules/SolidGeometry/Cube/execute.py index b6e3fc1..22841f6 100644 --- a/modules/SolidGeometry/Cube/execute.py +++ b/modules/SolidGeometry/Cube/execute.py @@ -16,7 +16,7 @@ def clear(): def Execute_Cube(): clear() cube_banner() - print("Calculate Cube Surface Area & Volume") + print("Calculate surface area and volume of the cube") #initiating def Input_side(): #input side length try: diff --git a/modules/SolidGeometry/RectangularPrism/execute.py b/modules/SolidGeometry/RectangularPrism/execute.py index a893d89..cf853d6 100644 --- a/modules/SolidGeometry/RectangularPrism/execute.py +++ b/modules/SolidGeometry/RectangularPrism/execute.py @@ -16,7 +16,7 @@ def clear(): def Execute_RectangularPrism(): clear() rectangularprism_banner() - print("Calculate Rectangular Prism Surface Area & Volume") + print("Calculate surface area and volume of the rectangular prism") #initiating def Input_length(): try: diff --git a/modules/SolidGeometry/Sphere/execute.py b/modules/SolidGeometry/Sphere/execute.py index ecc3b07..765ec9a 100644 --- a/modules/SolidGeometry/Sphere/execute.py +++ b/modules/SolidGeometry/Sphere/execute.py @@ -16,7 +16,7 @@ def clear(): def Execute_Sphere(): clear() sphere_banner() - print("Calculate Sphere Surface Area & Volume") + print("Calculate surface area and volume of the sphere") #initiating def Input_radius(): #input side length try: From 7b90b6cea12f9f6d2ee7436effd8dd979430e996 Mon Sep 17 00:00:00 2001 From: bangrezz Date: Sun, 14 Feb 2021 11:23:41 +0800 Subject: [PATCH 08/29] Added plane geometry shape = circle --- geometry_calc.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/geometry_calc.py b/geometry_calc.py index 379afee..bc2a6bc 100644 --- a/geometry_calc.py +++ b/geometry_calc.py @@ -3,6 +3,8 @@ from modules.PlaneGeometry.Triangle.menu import __triangle__ from modules.PlaneGeometry.Square.execute import Execute_Square from modules.PlaneGeometry.Rectangle.execute import Execute_Rectangle +from modules.PlaneGeometry.Circle.execute import Execute_Circle + from modules.SolidGeometry.Cube.execute import Execute_Cube from modules.SolidGeometry.RectangularPrism.execute import Execute_RectangularPrism from modules.SolidGeometry.Sphere.execute import Execute_Sphere @@ -62,19 +64,20 @@ def select_planegeo_menu(): select_planegeo = int(input("\n\t Select from the menu : ")) if select_planegeo == 1: #square - clear() Execute_Square() # calculate square PlaneGeo_Menu() elif select_planegeo == 2: #rectangle - clear() Execute_Rectangle() # calculate rectangle PlaneGeo_Menu() elif select_planegeo == 3: #triangle - clear() __triangle__() # go to triangle calc submenu PlaneGeo_Menu() + + elif select_planegeo == 4: #circle + Execute_Circle() # calculate circle + PlaneGeo_Menu() elif select_planegeo == 99: clear() @@ -101,18 +104,14 @@ def select_solidgeo_menu(): select_solidgeo = int(input("\n\t Select from the menu : ")) if select_solidgeo == 1: #cube - clear() Execute_Cube() #calculate cube SolidGeo_Menu() elif select_solidgeo == 2: #Rectangular Prism - clear() Execute_RectangularPrism() #calculate rectangular prism SolidGeo_Menu() elif select_solidgeo == 3: # sphere - clear() - #input("Sphere calc in development. Press to continue\n") Execute_Sphere() #calculate sphere SolidGeo_Menu() From 4f7085163950231b0ef2c104baf124941ef0ff4c Mon Sep 17 00:00:00 2001 From: bangrezz Date: Sun, 14 Feb 2021 11:29:33 +0800 Subject: [PATCH 09/29] Added circle shape at available geometry shapes list --- README.md | 13 +++++++------ modules/about.py | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index ff6fe92..5275500 100644 --- a/README.md +++ b/README.md @@ -42,11 +42,12 @@ python3 geometry_calc.py 1. The units displayed don't affect the calculation results. it's just a view. 2. Available geometry shapes : - Plane geometry - - rectangle - - square - - triangle (included pythagorean) + - Rectangle + - Square + - Triangle (included pythagorean) + - Circle [NEW] - Solid geometry - - cube - - rectangle prism - - sphere + - Cube + - Rectangle prism + - Sphere 3. Other geometry shapes are under development diff --git a/modules/about.py b/modules/about.py index 6fba8fb..a3720d3 100644 --- a/modules/about.py +++ b/modules/about.py @@ -57,13 +57,14 @@ def printabout(): 1. The units displayed don't affect the calculation results. it's just a view. 2. Available geometry shapes : - Plane geometry - - rectangle - - square - - triangle (included pythagorean) + - Rectangle + - Square + - Triangle (included pythagorean) + - Circle [NEW] - Solid geometry - - cube - - rectangle prism - - sphere + - Cube + - Rectangle prism + - Sphere 3. Other geometry shapes are under development """) print("\nPress [blue][/blue] to continue");input() From 5ffb667038c77e2069fde7f4d552c2f4a1b6433d Mon Sep 17 00:00:00 2001 From: bangrezz Date: Sun, 14 Feb 2021 11:41:26 +0800 Subject: [PATCH 10/29] Added circle shape at available geometry shapes list --- README.md | 2 +- modules/about.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5275500..8361b2a 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,6 @@ python3 geometry_calc.py - Circle [NEW] - Solid geometry - Cube - - Rectangle prism + - Rectangular prism - Sphere 3. Other geometry shapes are under development diff --git a/modules/about.py b/modules/about.py index a3720d3..f357163 100644 --- a/modules/about.py +++ b/modules/about.py @@ -63,7 +63,7 @@ def printabout(): - Circle [NEW] - Solid geometry - Cube - - Rectangle prism + - Rectangular prism - Sphere 3. Other geometry shapes are under development """) From fc74bb021a22831d92bc96a3bca43964fdf2565e Mon Sep 17 00:00:00 2001 From: bangrezz Date: Sun, 14 Feb 2021 11:45:27 +0800 Subject: [PATCH 11/29] Add .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5391d87..a81c8ee 100644 --- a/.gitignore +++ b/.gitignore @@ -135,4 +135,4 @@ dmypy.json .pytype/ # Cython debug symbols -cython_debug/ \ No newline at end of file +cython_debug/ From 3384d42ff5ffda55966c9664b6a86176bd98fe94 Mon Sep 17 00:00:00 2001 From: bangrezz Date: Sat, 10 Apr 2021 22:14:11 +0800 Subject: [PATCH 12/29] Add __init__.py file --- modules/SolidGeometry/Cylinder/__init__.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 modules/SolidGeometry/Cylinder/__init__.py diff --git a/modules/SolidGeometry/Cylinder/__init__.py b/modules/SolidGeometry/Cylinder/__init__.py new file mode 100644 index 0000000..3cc762b --- /dev/null +++ b/modules/SolidGeometry/Cylinder/__init__.py @@ -0,0 +1 @@ +"" \ No newline at end of file From 8c1966bf41ca58c832ec3880295615635edb0c87 Mon Sep 17 00:00:00 2001 From: bangrezz Date: Mon, 12 Apr 2021 08:59:18 +0800 Subject: [PATCH 13/29] Add cylinder calculator --- geometry_calc.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/geometry_calc.py b/geometry_calc.py index bc2a6bc..5d35351 100644 --- a/geometry_calc.py +++ b/geometry_calc.py @@ -8,6 +8,7 @@ from modules.SolidGeometry.Cube.execute import Execute_Cube from modules.SolidGeometry.RectangularPrism.execute import Execute_RectangularPrism from modules.SolidGeometry.Sphere.execute import Execute_Sphere +from modules.SolidGeometry.Cylinder.execute import Execute_Cylinder from rich import print import colorama colorama.init() @@ -115,6 +116,10 @@ def select_solidgeo_menu(): Execute_Sphere() #calculate sphere SolidGeo_Menu() + elif select_solidgeo == 4: # cylinder + Execute_Cylinder() + SolidGeo_Menu() + elif select_solidgeo == 99: clear() MainMenu() From 69afa626c5a053f1660541de9a5d60897a8688cb Mon Sep 17 00:00:00 2001 From: bangrezz Date: Mon, 12 Apr 2021 09:00:37 +0800 Subject: [PATCH 14/29] Add cylinder banner --- modules/banners.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/banners.py b/modules/banners.py index fe380a1..da040fd 100644 --- a/modules/banners.py +++ b/modules/banners.py @@ -78,6 +78,7 @@ def SolidGeo_banner(): 1. Cube 2. Rectangular Prism 3. Sphere + 4. Cylinder 99. Go back to the previous menu """ @@ -159,4 +160,10 @@ def sphere_banner(): fontsbanner = Figlet(font='slant') textbanner = (fontsbanner.renderText("Sphere")) print(colorama.Fore.LIGHTMAGENTA_EX, textbanner) # set textbanner color + print(colorama.Fore.RESET) #for reset color to default + +def cylinder_banner(): + fontsbanner = Figlet(font='slant') + textbanner = (fontsbanner.renderText("Cylinder")) + print(colorama.Fore.LIGHTMAGENTA_EX, textbanner) # set textbanner color print(colorama.Fore.RESET) #for reset color to default \ No newline at end of file From abde704bd3a72a16312453672b2b12eb55f7ba0e Mon Sep 17 00:00:00 2001 From: bangrezz Date: Mon, 12 Apr 2021 09:01:37 +0800 Subject: [PATCH 15/29] Add cylinder modules --- modules/SolidGeometry/Cylinder/calculate.py | 44 ++++++++++++++ modules/SolidGeometry/Cylinder/execute.py | 66 +++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 modules/SolidGeometry/Cylinder/calculate.py create mode 100644 modules/SolidGeometry/Cylinder/execute.py diff --git a/modules/SolidGeometry/Cylinder/calculate.py b/modules/SolidGeometry/Cylinder/calculate.py new file mode 100644 index 0000000..720000c --- /dev/null +++ b/modules/SolidGeometry/Cylinder/calculate.py @@ -0,0 +1,44 @@ +# module for calculate cylinder + +class Cylinder: + def __init__(self, radius, height, PI): + self.r = radius + self.PI = PI + self.h = height + + def Calculating_Volume(self): + global volume + volume = self.PI * self.r ** 2 * self.h # π * r^2 * h + return volume + + def Calculating_SurfaceArea(self): + global surface_area + surface_area = 2 * self.PI * self.r * (self.h + self.r) + return surface_area + + def Result(self): + res = f"""\n + ---------------------------------------------- + CALCULATE + ---------------------------------------------- + + Radius (r) = {self.r} cm + + Height (h) = {self.h} cm + + Pi value (π) = {self.PI} + + Formula the closed cylinder + surface area = 2 * π * r (h + r) + = 2 * {self.PI} * {self.r} cm ({self.h} cm + {self.r} cm) + + Formula the cylinder volume = π * r^2 * h + = {self.PI} * {self.r}^2 cm * {self.h} cm + + --------------------RESULT-------------------- + + Sphere surface area = {surface_area} cm^2 + + Sphere volume = {volume} cm^3 + """ + return res \ No newline at end of file diff --git a/modules/SolidGeometry/Cylinder/execute.py b/modules/SolidGeometry/Cylinder/execute.py new file mode 100644 index 0000000..16b55b6 --- /dev/null +++ b/modules/SolidGeometry/Cylinder/execute.py @@ -0,0 +1,66 @@ +# module for execute cylinder + +from os import system, name +from modules.SolidGeometry.Cylinder.calculate import Cylinder +from modules.banners import cylinder_banner +from modules.wannaquit import question + +def clear(): + # for windows + if name == 'nt': + _ = system('cls') + # for mac and linux(here, os.name is 'posix') + else: + _ = system('clear') + +def Execute_Cylinder(): + clear() + cylinder_banner() + print("\"Calculate surface area and volume of the cylinder\"") + #initiating + def Input_radius(): + try: + global radius + radius = float(input("\nEnter radius length (r) = ")) + if radius <= 0:print("[ERROR] The value must greater than 0 !");Input_radius() + except ValueError: + print("[ERROR] Enter again !") + Input_radius() + except KeyboardInterrupt: + print("\n\nThank you for using Geometry Calc :)") + exit() + Input_radius() + def Input_height(): + try: + global height + height = float(input("\nEnter height length (h) = ")) + if height <= 0:print("[ERROR] The value must greater than 0 !");Input_height() + except ValueError: + print("[ERROR] Enter again !") + Input_radius() + except KeyboardInterrupt: + print("\n\nThank you for using Geometry Calc :)") + exit() + Input_height() + def Input_pi(): + try: + global PI + # select pi value + select_pi = input("\nUsing pi (π) default value : 3.14 ? [y/n] = ") + if select_pi == 'y':PI = 3.14 # set default pi value to 3.14 + elif select_pi == 'n': + print("""\n\n[NOTE] pi value must 3.14. But, you can custom decimal value of pi. +Example : 3.14159""") + PI = float(input("\nEnter custom pi value (π) = ")) + else:print("\n[ERROR] Please enter correctly");Input_pi() + except ValueError: + print("[ERROR] Enter again !") + Input_pi() + except KeyboardInterrupt: + print("\n\nThank you for using Geometry Calc :)") + exit() + Input_pi() + ExecCylinder = Cylinder(radius, height, PI) + ExecCylinder.Calculating_Volume();ExecCylinder.Calculating_SurfaceArea() + result = ExecCylinder.Result();print(result) + question() \ No newline at end of file From 4a0d3058c98d01f37983fcc67ad015191ce544a3 Mon Sep 17 00:00:00 2001 From: bangrezz Date: Mon, 12 Apr 2021 09:02:19 +0800 Subject: [PATCH 16/29] Modifed files --- modules/SolidGeometry/Sphere/calculate.py | 2 +- modules/SolidGeometry/Sphere/execute.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/SolidGeometry/Sphere/calculate.py b/modules/SolidGeometry/Sphere/calculate.py index 5cc2d1f..91f6aea 100644 --- a/modules/SolidGeometry/Sphere/calculate.py +++ b/modules/SolidGeometry/Sphere/calculate.py @@ -2,7 +2,7 @@ class Sphere: def __init__(self, radius, PI): - self.r = radius + self.r = radius self.PI = PI def Calculating_Volume(self): diff --git a/modules/SolidGeometry/Sphere/execute.py b/modules/SolidGeometry/Sphere/execute.py index 765ec9a..e3e7e53 100644 --- a/modules/SolidGeometry/Sphere/execute.py +++ b/modules/SolidGeometry/Sphere/execute.py @@ -18,7 +18,7 @@ def Execute_Sphere(): sphere_banner() print("Calculate surface area and volume of the sphere") #initiating - def Input_radius(): #input side length + def Input_radius(): try: global radius radius = float(input("\nEnter radius length (r) = ")) From 4266b50c107d9f765e74aacafa00f05dcbfa38dc Mon Sep 17 00:00:00 2001 From: bangrezz Date: Mon, 12 Apr 2021 09:04:56 +0800 Subject: [PATCH 17/29] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8361b2a..fb3af43 100644 --- a/README.md +++ b/README.md @@ -50,4 +50,5 @@ python3 geometry_calc.py - Cube - Rectangular prism - Sphere + - Cylinder [NEW] 3. Other geometry shapes are under development From 1cded0fc57b171f7cd351499d88b28ac3cd1e031 Mon Sep 17 00:00:00 2001 From: bangrezz Date: Mon, 12 Apr 2021 10:05:09 +0800 Subject: [PATCH 18/29] Add clearscreen module --- modules/clearscreen.py | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 modules/clearscreen.py diff --git a/modules/clearscreen.py b/modules/clearscreen.py new file mode 100644 index 0000000..1161913 --- /dev/null +++ b/modules/clearscreen.py @@ -0,0 +1,11 @@ +from os import system, name + +def clear(): + + # for windows + if name == 'nt': + _ = system('cls') + + # for mac and linux(here, os.name is 'posix') + else: + _ = system('clear') \ No newline at end of file From ff9b58c89df094ec53e4ae6e8042798ef7139ddb Mon Sep 17 00:00:00 2001 From: bangrezz Date: Mon, 12 Apr 2021 10:25:48 +0800 Subject: [PATCH 19/29] Remove clear() function --- geometry_calc.py | 15 +-------------- modules/PlaneGeometry/Circle/execute.py | 10 +--------- modules/PlaneGeometry/Rectangle/execute.py | 10 +--------- modules/PlaneGeometry/Square/execute.py | 10 +--------- modules/PlaneGeometry/Triangle/execute.py | 10 +--------- modules/PlaneGeometry/Triangle/menu.py | 11 +---------- modules/SolidGeometry/Cube/execute.py | 10 +--------- modules/SolidGeometry/Cylinder/execute.py | 10 +--------- modules/SolidGeometry/RectangularPrism/execute.py | 10 +--------- modules/SolidGeometry/Sphere/execute.py | 10 +--------- 10 files changed, 10 insertions(+), 96 deletions(-) diff --git a/geometry_calc.py b/geometry_calc.py index 5d35351..2761d96 100644 --- a/geometry_calc.py +++ b/geometry_calc.py @@ -1,4 +1,4 @@ -from os import system, name +from modules.clearscreen import clear from modules.banners import PlaneGeo_banner, SolidGeo_banner, main_banner from modules.PlaneGeometry.Triangle.menu import __triangle__ from modules.PlaneGeometry.Square.execute import Execute_Square @@ -10,19 +10,6 @@ from modules.SolidGeometry.Sphere.execute import Execute_Sphere from modules.SolidGeometry.Cylinder.execute import Execute_Cylinder from rich import print -import colorama -colorama.init() - - -def clear(): - - # for windows - if name == 'nt': - _ = system('cls') - - # for mac and linux(here, os.name is 'posix') - else: - _ = system('clear') def MainMenu(): clear() diff --git a/modules/PlaneGeometry/Circle/execute.py b/modules/PlaneGeometry/Circle/execute.py index 6838027..0766af5 100644 --- a/modules/PlaneGeometry/Circle/execute.py +++ b/modules/PlaneGeometry/Circle/execute.py @@ -1,17 +1,9 @@ # module for execute area & circumference circle -from os import system, name +from modules.clearscreen import clear from modules.PlaneGeometry.Circle.calculate import Circle from modules.banners import circle_banner from modules.wannaquit import question -def clear(): - # for windows - if name == 'nt': - _ = system('cls') - # for mac and linux(here, os.name is 'posix') - else: - _ = system('clear') - def Execute_Circle(): clear() circle_banner() diff --git a/modules/PlaneGeometry/Rectangle/execute.py b/modules/PlaneGeometry/Rectangle/execute.py index 60ae0a9..d67fb12 100644 --- a/modules/PlaneGeometry/Rectangle/execute.py +++ b/modules/PlaneGeometry/Rectangle/execute.py @@ -1,18 +1,10 @@ # module for execute area & perimeter square -from os import system, name +from modules.clearscreen import clear from modules.PlaneGeometry.Rectangle.calculate import Rectangle from modules.banners import rectangle_banner from modules.wannaquit import question -def clear(): - # for windows - if name == 'nt': - _ = system('cls') - # for mac and linux(here, os.name is 'posix') - else: - _ = system('clear') - def Execute_Rectangle(): clear() rectangle_banner() diff --git a/modules/PlaneGeometry/Square/execute.py b/modules/PlaneGeometry/Square/execute.py index 66f956a..7fb193f 100644 --- a/modules/PlaneGeometry/Square/execute.py +++ b/modules/PlaneGeometry/Square/execute.py @@ -1,17 +1,9 @@ # module for execute area & perimeter square -from os import system, name +from modules.clearscreen import clear from modules.PlaneGeometry.Square.calculate import Square from modules.banners import square_banner from modules.wannaquit import question -def clear(): - # for windows - if name == 'nt': - _ = system('cls') - # for mac and linux(here, os.name is 'posix') - else: - _ = system('clear') - def Execute_Square(): clear() square_banner() diff --git a/modules/PlaneGeometry/Triangle/execute.py b/modules/PlaneGeometry/Triangle/execute.py index 4c08d7b..5fe7edc 100644 --- a/modules/PlaneGeometry/Triangle/execute.py +++ b/modules/PlaneGeometry/Triangle/execute.py @@ -1,18 +1,10 @@ # module for execute area & perimeter triangle and pythagorean -from os import system, name +from modules.clearscreen import clear from modules.PlaneGeometry.Triangle.calculate import TriangleArea, TrianglePerimeter from modules.PlaneGeometry.Triangle.pythagorean import Pythagorean_Side_a, Pythagorean_Side_b, Pythagorean_Hypotenuse from modules.wannaquit import question -def clear(): - # for windows - if name == 'nt': - _ = system('cls') - # for mac and linux(here, os.name is 'posix') - else: - _ = system('clear') - def Execute_Area(): clear() print("Calculate area of the triangle") diff --git a/modules/PlaneGeometry/Triangle/menu.py b/modules/PlaneGeometry/Triangle/menu.py index f82dbdc..f66548b 100644 --- a/modules/PlaneGeometry/Triangle/menu.py +++ b/modules/PlaneGeometry/Triangle/menu.py @@ -1,16 +1,7 @@ -from os import system, name +from modules.clearscreen import clear from modules.PlaneGeometry.Triangle.execute import Execute_Area, Execute_Perimeter, Execute_Pythagorean from modules.banners import triangle_banner, pythagorean_banner - -def clear(): - # for windows - if name == 'nt': - _ = system('cls') - # for mac and linux(here, os.name is 'posix') - else: - _ = system('clear') - # pythagorean main menu, triangle submenu def __pythagorean__(): clear() diff --git a/modules/SolidGeometry/Cube/execute.py b/modules/SolidGeometry/Cube/execute.py index 22841f6..c42f9a9 100644 --- a/modules/SolidGeometry/Cube/execute.py +++ b/modules/SolidGeometry/Cube/execute.py @@ -1,18 +1,10 @@ # module for execute surface area & volume cube -from os import system, name +from modules.clearscreen import clear from modules.SolidGeometry.Cube.calculate import Cube from modules.banners import cube_banner from modules.wannaquit import question -def clear(): - # for windows - if name == 'nt': - _ = system('cls') - # for mac and linux(here, os.name is 'posix') - else: - _ = system('clear') - def Execute_Cube(): clear() cube_banner() diff --git a/modules/SolidGeometry/Cylinder/execute.py b/modules/SolidGeometry/Cylinder/execute.py index 16b55b6..07795b7 100644 --- a/modules/SolidGeometry/Cylinder/execute.py +++ b/modules/SolidGeometry/Cylinder/execute.py @@ -1,18 +1,10 @@ # module for execute cylinder -from os import system, name +from modules.clearscreen import clear from modules.SolidGeometry.Cylinder.calculate import Cylinder from modules.banners import cylinder_banner from modules.wannaquit import question -def clear(): - # for windows - if name == 'nt': - _ = system('cls') - # for mac and linux(here, os.name is 'posix') - else: - _ = system('clear') - def Execute_Cylinder(): clear() cylinder_banner() diff --git a/modules/SolidGeometry/RectangularPrism/execute.py b/modules/SolidGeometry/RectangularPrism/execute.py index cf853d6..1548f34 100644 --- a/modules/SolidGeometry/RectangularPrism/execute.py +++ b/modules/SolidGeometry/RectangularPrism/execute.py @@ -1,18 +1,10 @@ # module for execute surface area & volume rectangular prism -from os import system, name +from modules.clearscreen import clear from modules.SolidGeometry.RectangularPrism.calculate import RectangularPrism from modules.banners import rectangularprism_banner from modules.wannaquit import question -def clear(): - # for windows - if name == 'nt': - _ = system('cls') - # for mac and linux(here, os.name is 'posix') - else: - _ = system('clear') - def Execute_RectangularPrism(): clear() rectangularprism_banner() diff --git a/modules/SolidGeometry/Sphere/execute.py b/modules/SolidGeometry/Sphere/execute.py index e3e7e53..b98f174 100644 --- a/modules/SolidGeometry/Sphere/execute.py +++ b/modules/SolidGeometry/Sphere/execute.py @@ -1,18 +1,10 @@ # module for execute surface area & volume sphere -from os import system, name +from modules.clearscreen import clear from modules.SolidGeometry.Sphere.calculate import Sphere from modules.banners import sphere_banner from modules.wannaquit import question -def clear(): - # for windows - if name == 'nt': - _ = system('cls') - # for mac and linux(here, os.name is 'posix') - else: - _ = system('clear') - def Execute_Sphere(): clear() sphere_banner() From 90a8b6d67ceeb021402a49961418b36538712c5f Mon Sep 17 00:00:00 2001 From: bangrezz Date: Mon, 12 Apr 2021 11:01:19 +0800 Subject: [PATCH 20/29] Remove clear() function --- modules/about.py | 13 ++----------- modules/wannaquit.py | 11 +---------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/modules/about.py b/modules/about.py index f357163..d7d201c 100644 --- a/modules/about.py +++ b/modules/about.py @@ -1,16 +1,6 @@ -from os import system, name +from modules.clearscreen import clear from rich import print -def clear(): - - # for windows - if name == 'nt': - _ = system('cls') - - # for mac and linux(here, os.name is 'posix') - else: - _ = system('clear') - def printabout(): print(""" # geometry_calc @@ -65,6 +55,7 @@ def printabout(): - Cube - Rectangular prism - Sphere + - Cylinder [NEW] 3. Other geometry shapes are under development """) print("\nPress [blue][/blue] to continue");input() diff --git a/modules/wannaquit.py b/modules/wannaquit.py index fa476a1..50ce55d 100644 --- a/modules/wannaquit.py +++ b/modules/wannaquit.py @@ -1,14 +1,5 @@ -from os import system, name +from modules.clearscreen import clear from rich import print -def clear(): - - # for windows - if name == 'nt': - _ = system('cls') - - # for mac and linux(here, os.name is 'posix') - else: - _ = system('clear') def question(): try: From fb7becb58c9f541c1426ee5c356614a3121d40c8 Mon Sep 17 00:00:00 2001 From: bangrezz Date: Wed, 14 Apr 2021 11:17:10 +0800 Subject: [PATCH 21/29] Delete wannaquit module --- modules/wannaquit.py | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 modules/wannaquit.py diff --git a/modules/wannaquit.py b/modules/wannaquit.py deleted file mode 100644 index 50ce55d..0000000 --- a/modules/wannaquit.py +++ /dev/null @@ -1,21 +0,0 @@ -from modules.clearscreen import clear -from rich import print - -def question(): - try: - def Repeat(): - count_again = input("\nDo you want to count again ? [y/n] : ") - if count_again == 'y': - print("Press [blue][/blue] to continue") - input() - elif count_again == 'n': - print("\nThank you for using Geometry Calc :)") - exit() - else: - print("[red][ERROR][/red] Invalid input. Repeat again !") - Repeat() - Repeat() - - except KeyboardInterrupt: - print("\n\nThank you for using Geometry Calc :)") - exit() \ No newline at end of file From b65e85d14e8bfb2d47d67745ed4eec3a99433e4d Mon Sep 17 00:00:00 2001 From: bangrezz Date: Wed, 14 Apr 2021 11:31:04 +0800 Subject: [PATCH 22/29] Update files --- modules/PlaneGeometry/Circle/calculate.py | 4 ++-- modules/PlaneGeometry/Circle/execute.py | 4 ++-- modules/PlaneGeometry/Rectangle/execute.py | 4 ++-- modules/PlaneGeometry/Square/execute.py | 4 ++-- modules/PlaneGeometry/Triangle/execute.py | 17 +++++++++++------ modules/SolidGeometry/Cube/execute.py | 4 ++-- modules/SolidGeometry/Cylinder/execute.py | 4 ++-- .../SolidGeometry/RectangularPrism/calculate.py | 2 +- .../SolidGeometry/RectangularPrism/execute.py | 4 ++-- modules/SolidGeometry/Sphere/execute.py | 4 ++-- 10 files changed, 28 insertions(+), 23 deletions(-) diff --git a/modules/PlaneGeometry/Circle/calculate.py b/modules/PlaneGeometry/Circle/calculate.py index 9aa3922..028513c 100644 --- a/modules/PlaneGeometry/Circle/calculate.py +++ b/modules/PlaneGeometry/Circle/calculate.py @@ -33,8 +33,8 @@ def Result(self): --------------------RESULT-------------------- - Circle perimeter = {perimeter} cm + Circle perimeter = {perimeter} cm - Cirle area = {area} cm^2 + Circle area = {area} cm^2 """ return res \ No newline at end of file diff --git a/modules/PlaneGeometry/Circle/execute.py b/modules/PlaneGeometry/Circle/execute.py index 0766af5..683d3f1 100644 --- a/modules/PlaneGeometry/Circle/execute.py +++ b/modules/PlaneGeometry/Circle/execute.py @@ -2,7 +2,7 @@ from modules.clearscreen import clear from modules.PlaneGeometry.Circle.calculate import Circle from modules.banners import circle_banner -from modules.wannaquit import question +from modules.PlaneGeometry.Circle.wannaquit import MainQuestion def Execute_Circle(): clear() @@ -42,4 +42,4 @@ def Input_pi(): ExecCircle = Circle(radius,PI) ExecCircle.Calculating_Area();ExecCircle.Calculating_Circumference() result = ExecCircle.Result();print(result) - question() \ No newline at end of file + MainQuestion() \ No newline at end of file diff --git a/modules/PlaneGeometry/Rectangle/execute.py b/modules/PlaneGeometry/Rectangle/execute.py index d67fb12..8a36d7f 100644 --- a/modules/PlaneGeometry/Rectangle/execute.py +++ b/modules/PlaneGeometry/Rectangle/execute.py @@ -3,7 +3,7 @@ from modules.clearscreen import clear from modules.PlaneGeometry.Rectangle.calculate import Rectangle from modules.banners import rectangle_banner -from modules.wannaquit import question +from modules.PlaneGeometry.Rectangle.wannaquit import MainQuestion def Execute_Rectangle(): clear() @@ -48,4 +48,4 @@ def width_sameAs_length(): ExecRectangle = Rectangle(length,width) ExecRectangle.Calculating_Area();ExecRectangle.Calculating_Perimeter() result = ExecRectangle.Result();print(result) - question() \ No newline at end of file + MainQuestion() \ No newline at end of file diff --git a/modules/PlaneGeometry/Square/execute.py b/modules/PlaneGeometry/Square/execute.py index 7fb193f..c19e0ef 100644 --- a/modules/PlaneGeometry/Square/execute.py +++ b/modules/PlaneGeometry/Square/execute.py @@ -2,7 +2,7 @@ from modules.clearscreen import clear from modules.PlaneGeometry.Square.calculate import Square from modules.banners import square_banner -from modules.wannaquit import question +from modules.PlaneGeometry.Square.wannaquit import MainQuestion def Execute_Square(): clear() @@ -24,4 +24,4 @@ def Input_side(): #input side length ExecSquare = Square(side) ExecSquare.Calculating_Area();ExecSquare.Calculating_Perimeter() result = ExecSquare.Result();print(result) - question() \ No newline at end of file + MainQuestion() \ No newline at end of file diff --git a/modules/PlaneGeometry/Triangle/execute.py b/modules/PlaneGeometry/Triangle/execute.py index 5fe7edc..b1f9789 100644 --- a/modules/PlaneGeometry/Triangle/execute.py +++ b/modules/PlaneGeometry/Triangle/execute.py @@ -3,7 +3,7 @@ from modules.clearscreen import clear from modules.PlaneGeometry.Triangle.calculate import TriangleArea, TrianglePerimeter from modules.PlaneGeometry.Triangle.pythagorean import Pythagorean_Side_a, Pythagorean_Side_b, Pythagorean_Hypotenuse -from modules.wannaquit import question +from modules.PlaneGeometry.Triangle.wannaquit import TriangleQuestion, PythagoreanQuestion def Execute_Area(): clear() @@ -37,7 +37,8 @@ def Input_Height(): #input height length area.Calculating_Area() result = area.Result_Area() print(result) - question() + question = TriangleQuestion() + question.AreaQuestion() def Execute_Perimeter(): clear() @@ -84,7 +85,8 @@ def Input_side_c(): #side c perimeter.Calculating_Perimeter() result = perimeter.Result_Perimeter() print(result) - question() + question = TriangleQuestion() + question.PerimeterQuestion() class Execute_Pythagorean: def Execute_side_a(self): # function for find side a @@ -124,7 +126,8 @@ def Input_side_c(): #side hypotenuse c ExecSide_a = Pythagorean_Side_a(b,c) ExecSide_a.Find_Side_a() result = ExecSide_a.Result_Side_a(); print(result) - question() + question = PythagoreanQuestion() + question.A_Question() def Execute_side_b(self): # function for find side b clear() @@ -163,7 +166,8 @@ def Input_side_c(): #side hypotenuse c ExecSide_b = Pythagorean_Side_b(a,c) ExecSide_b.Find_Side_b() result = ExecSide_b.Result_Side_b(); print(result) - question() + question = PythagoreanQuestion() + question.B_Question() def Execute_Hypotenuse(self): # function for find side hypotenuse clear() @@ -197,4 +201,5 @@ def Input_side_b(): # side b Exec_Hypotenuse = Pythagorean_Hypotenuse(a,b) Exec_Hypotenuse.Find_Hypotenuse() result = Exec_Hypotenuse.Result_Hypotenuse(); print(result) - question() \ No newline at end of file + question = PythagoreanQuestion() + question.C_Question() \ No newline at end of file diff --git a/modules/SolidGeometry/Cube/execute.py b/modules/SolidGeometry/Cube/execute.py index c42f9a9..75e61f0 100644 --- a/modules/SolidGeometry/Cube/execute.py +++ b/modules/SolidGeometry/Cube/execute.py @@ -3,7 +3,7 @@ from modules.clearscreen import clear from modules.SolidGeometry.Cube.calculate import Cube from modules.banners import cube_banner -from modules.wannaquit import question +from modules.SolidGeometry.Cube.wannaquit import MainQuestion def Execute_Cube(): clear() @@ -25,4 +25,4 @@ def Input_side(): #input side length ExecCube = Cube(side) ExecCube.Calculating_Volume();ExecCube.Calculating_SurfaceArea() result = ExecCube.Result();print(result) - question() \ No newline at end of file + MainQuestion() \ No newline at end of file diff --git a/modules/SolidGeometry/Cylinder/execute.py b/modules/SolidGeometry/Cylinder/execute.py index 07795b7..0ec82db 100644 --- a/modules/SolidGeometry/Cylinder/execute.py +++ b/modules/SolidGeometry/Cylinder/execute.py @@ -3,7 +3,7 @@ from modules.clearscreen import clear from modules.SolidGeometry.Cylinder.calculate import Cylinder from modules.banners import cylinder_banner -from modules.wannaquit import question +from modules.SolidGeometry.Cylinder.wannaquit import MainQuestion def Execute_Cylinder(): clear() @@ -55,4 +55,4 @@ def Input_pi(): ExecCylinder = Cylinder(radius, height, PI) ExecCylinder.Calculating_Volume();ExecCylinder.Calculating_SurfaceArea() result = ExecCylinder.Result();print(result) - question() \ No newline at end of file + MainQuestion() \ No newline at end of file diff --git a/modules/SolidGeometry/RectangularPrism/calculate.py b/modules/SolidGeometry/RectangularPrism/calculate.py index ae5ca48..e521976 100644 --- a/modules/SolidGeometry/RectangularPrism/calculate.py +++ b/modules/SolidGeometry/RectangularPrism/calculate.py @@ -40,6 +40,6 @@ def Result(self): Rectangular prism surface area = {surface_area} cm^2 - Rectangle prism volume = {volume} cm^3 + Rectangular prism volume = {volume} cm^3 """ return res \ No newline at end of file diff --git a/modules/SolidGeometry/RectangularPrism/execute.py b/modules/SolidGeometry/RectangularPrism/execute.py index 1548f34..64f5955 100644 --- a/modules/SolidGeometry/RectangularPrism/execute.py +++ b/modules/SolidGeometry/RectangularPrism/execute.py @@ -3,7 +3,7 @@ from modules.clearscreen import clear from modules.SolidGeometry.RectangularPrism.calculate import RectangularPrism from modules.banners import rectangularprism_banner -from modules.wannaquit import question +from modules.SolidGeometry.RectangularPrism.wannaquit import MainQuestion def Execute_RectangularPrism(): clear() @@ -60,4 +60,4 @@ def same_value(): ExecRectangularPrism = RectangularPrism(length,width,height) ExecRectangularPrism.Calculating_Volume();ExecRectangularPrism.Calculating_SurfaceArea() result = ExecRectangularPrism.Result();print(result) - question() \ No newline at end of file + MainQuestion() \ No newline at end of file diff --git a/modules/SolidGeometry/Sphere/execute.py b/modules/SolidGeometry/Sphere/execute.py index b98f174..215ae09 100644 --- a/modules/SolidGeometry/Sphere/execute.py +++ b/modules/SolidGeometry/Sphere/execute.py @@ -3,7 +3,7 @@ from modules.clearscreen import clear from modules.SolidGeometry.Sphere.calculate import Sphere from modules.banners import sphere_banner -from modules.wannaquit import question +from modules.SolidGeometry.Sphere.wannaquit import MainQuestion def Execute_Sphere(): clear() @@ -43,4 +43,4 @@ def Input_pi(): ExecSphere = Sphere(radius,PI) ExecSphere.Calculating_Volume();ExecSphere.Calculating_SurfaceArea() result = ExecSphere.Result();print(result) - question() \ No newline at end of file + MainQuestion() \ No newline at end of file From cd617a6314538db600fc5a55f1cdfd6b486de99f Mon Sep 17 00:00:00 2001 From: bangrezz Date: Wed, 14 Apr 2021 11:31:41 +0800 Subject: [PATCH 23/29] Add new wannaquit modules --- modules/PlaneGeometry/Circle/wannaquit.py | 34 ++++ modules/PlaneGeometry/Rectangle/wannaquit.py | 34 ++++ modules/PlaneGeometry/Square/wannaquit.py | 34 ++++ modules/PlaneGeometry/Triangle/wannaquit.py | 167 ++++++++++++++++++ modules/SolidGeometry/Cube/wannaquit.py | 34 ++++ modules/SolidGeometry/Cylinder/wannaquit.py | 34 ++++ .../RectangularPrism/wannaquit.py | 34 ++++ modules/SolidGeometry/Sphere/wannaquit.py | 34 ++++ 8 files changed, 405 insertions(+) create mode 100644 modules/PlaneGeometry/Circle/wannaquit.py create mode 100644 modules/PlaneGeometry/Rectangle/wannaquit.py create mode 100644 modules/PlaneGeometry/Square/wannaquit.py create mode 100644 modules/PlaneGeometry/Triangle/wannaquit.py create mode 100644 modules/SolidGeometry/Cube/wannaquit.py create mode 100644 modules/SolidGeometry/Cylinder/wannaquit.py create mode 100644 modules/SolidGeometry/RectangularPrism/wannaquit.py create mode 100644 modules/SolidGeometry/Sphere/wannaquit.py diff --git a/modules/PlaneGeometry/Circle/wannaquit.py b/modules/PlaneGeometry/Circle/wannaquit.py new file mode 100644 index 0000000..2459514 --- /dev/null +++ b/modules/PlaneGeometry/Circle/wannaquit.py @@ -0,0 +1,34 @@ +from modules.clearscreen import clear +from rich import print + +def MainQuestion(): + print(""" + ________________________________________________ + What you want to do ? + + 1. Count again + 2. Go to the previous menu + 99. Exit + """) + def question(): + try: + select = int(input("Select : ")) + if select == 1: + from modules.PlaneGeometry.Circle.execute import Execute_Circle + Execute_Circle() + elif select == 2: + print("Press [blue][/blue] to continue") + input() + elif select == 99: + print("\n\nThank you for using Geometry Calc :)") + exit() + else: + print("[red][ERROR][/red] Invalid input. Enter again !") + question() + except ValueError: + print("[red][ERROR][/red] Value error. Enter again !") + question() + except KeyboardInterrupt: + print("\n\nThank you for using Geometry Calc :)") + exit() + question() \ No newline at end of file diff --git a/modules/PlaneGeometry/Rectangle/wannaquit.py b/modules/PlaneGeometry/Rectangle/wannaquit.py new file mode 100644 index 0000000..2c4a4e5 --- /dev/null +++ b/modules/PlaneGeometry/Rectangle/wannaquit.py @@ -0,0 +1,34 @@ +from modules.clearscreen import clear +from rich import print + +def MainQuestion(): + print(""" + ________________________________________________ + What you want to do ? + + 1. Count again + 2. Go to the previous menu + 99. Exit + """) + def question(): + try: + select = int(input("Select : ")) + if select == 1: + from modules.PlaneGeometry.Rectangle.execute import Execute_Rectangle + Execute_Rectangle() + elif select == 2: + print("Press [blue][/blue] to continue") + input() + elif select == 99: + print("\n\nThank you for using Geometry Calc :)") + exit() + else: + print("[red][ERROR][/red] Invalid input. Enter again !") + question() + except ValueError: + print("[red][ERROR][/red] Value error. Enter again !") + question() + except KeyboardInterrupt: + print("\n\nThank you for using Geometry Calc :)") + exit() + question() \ No newline at end of file diff --git a/modules/PlaneGeometry/Square/wannaquit.py b/modules/PlaneGeometry/Square/wannaquit.py new file mode 100644 index 0000000..c53e0b8 --- /dev/null +++ b/modules/PlaneGeometry/Square/wannaquit.py @@ -0,0 +1,34 @@ +from modules.clearscreen import clear +from rich import print + +def MainQuestion(): + print(""" + ________________________________________________ + What you want to do ? + + 1. Count again + 2. Go to the previous menu + 99. Exit + """) + def question(): + try: + select = int(input("Select : ")) + if select == 1: + from modules.PlaneGeometry.Square.execute import Execute_Square + Execute_Square() + elif select == 2: + print("Press [blue][/blue] to continue") + input() + elif select == 99: + print("\n\nThank you for using Geometry Calc :)") + exit() + else: + print("[red][ERROR][/red] Invalid input. Enter again !") + question() + except ValueError: + print("[red][ERROR][/red] Value error. Enter again !") + question() + except KeyboardInterrupt: + print("\n\nThank you for using Geometry Calc :)") + exit() + question() \ No newline at end of file diff --git a/modules/PlaneGeometry/Triangle/wannaquit.py b/modules/PlaneGeometry/Triangle/wannaquit.py new file mode 100644 index 0000000..6a5c34e --- /dev/null +++ b/modules/PlaneGeometry/Triangle/wannaquit.py @@ -0,0 +1,167 @@ +from modules.clearscreen import clear +from rich import print + +class TriangleQuestion: + def AreaQuestion(self): + print(""" + ________________________________________________ + What you want to do ? + + 1. Count again + 2. Go to the previous menu + 99. Exit + """) + def select_question(): + try: + select = int(input("Select : ")) + if select == 1: + from modules.PlaneGeometry.Triangle.execute import Execute_Area + Execute_Area() + elif select == 2: + print("Press [blue][/blue] to continue") + input() + elif select == 99: + print("\n\nThank you for using Geometry Calc :)") + exit() + else: + print("[red][ERROR][/red] Invalid input. Enter again !") + select_question() + except ValueError: + print("[red][ERROR][/red] Value error. Enter again !") + select_question() + except KeyboardInterrupt: + print("\n\nThank you for using Geometry Calc :)") + exit() + select_question() + + def PerimeterQuestion(self): + print(""" + ________________________________________________ + What you want to do ? + + 1. Count again + 2. Go to the previous menu + 99. Exit + """) + def select_question(): + try: + select = int(input("Select : ")) + if select == 1: + from modules.PlaneGeometry.Triangle.execute import Execute_Perimeter + Execute_Perimeter() + elif select == 2: + print("Press [blue][/blue] to continue") + input() + elif select == 99: + print("\n\nThank you for using Geometry Calc :)") + exit() + else: + print("[red][ERROR][/red] Invalid input. Enter again !") + select_question() + except ValueError: + print("[red][ERROR][/red] Value error. Enter again !") + select_question() + except KeyboardInterrupt: + print("\n\nThank you for using Geometry Calc :)") + exit() + select_question() + +class PythagoreanQuestion: + def A_Question(self): + print(""" + ________________________________________________ + What you want to do ? + + 1. Count again + 2. Go to the previous menu + 99. Exit + """) + def select_question(): + try: + select = int(input("Select : ")) + if select == 1: + from modules.PlaneGeometry.Triangle.execute import Execute_Pythagorean + side_a = Execute_Pythagorean() + side_a.Execute_side_a() + elif select == 2: + print("Press [blue][/blue] to continue") + input() + elif select == 99: + print("\n\nThank you for using Geometry Calc :)") + exit() + else: + print("[red][ERROR][/red] Invalid input. Enter again !") + select_question() + except ValueError: + print("[red][ERROR][/red] Value error. Enter again !") + select_question() + except KeyboardInterrupt: + print("\n\nThank you for using Geometry Calc :)") + exit() + select_question() + + def B_Question(self): + print(""" + ________________________________________________ + What you want to do ? + + 1. Count again + 2. Go to the previous menu + 99. Exit + """) + def select_question(): + try: + select = int(input("Select : ")) + if select == 1: + from modules.PlaneGeometry.Triangle.execute import Execute_Pythagorean + side_b = Execute_Pythagorean() + side_b.Execute_side_b + elif select == 2: + print("Press [blue][/blue] to continue") + input() + elif select == 99: + print("\n\nThank you for using Geometry Calc :)") + exit() + else: + print("[red][ERROR][/red] Invalid input. Enter again !") + select_question() + except ValueError: + print("[red][ERROR][/red] Value error. Enter again !") + select_question() + except KeyboardInterrupt: + print("\n\nThank you for using Geometry Calc :)") + exit() + select_question() + + def C_Question(self): + print(""" + ________________________________________________ + What you want to do ? + + 1. Count again + 2. Go to the previous menu + 99. Exit + """) + def select_question(): + try: + select = int(input("Select : ")) + if select == 1: + from modules.PlaneGeometry.Triangle.execute import Execute_Pythagorean + side_c = Execute_Pythagorean() + side_c.Execute_Hypotenuse() + elif select == 2: + print("Press [blue][/blue] to continue") + input() + elif select == 99: + print("\n\nThank you for using Geometry Calc :)") + exit() + else: + print("[red][ERROR][/red] Invalid input. Enter again !") + select_question() + except ValueError: + print("[red][ERROR][/red] Value error. Enter again !") + select_question() + except KeyboardInterrupt: + print("\n\nThank you for using Geometry Calc :)") + exit() + select_question() \ No newline at end of file diff --git a/modules/SolidGeometry/Cube/wannaquit.py b/modules/SolidGeometry/Cube/wannaquit.py new file mode 100644 index 0000000..102e0f6 --- /dev/null +++ b/modules/SolidGeometry/Cube/wannaquit.py @@ -0,0 +1,34 @@ +from modules.clearscreen import clear +from rich import print + +def MainQuestion(): + print(""" + ________________________________________________ + What you want to do ? + + 1. Count again + 2. Go to the previous menu + 99. Exit + """) + def question(): + try: + select = int(input("Select : ")) + if select == 1: + from modules.SolidGeometry.Cube.execute import Execute_Cube + Execute_Cube() + elif select == 2: + print("Press [blue][/blue] to continue") + input() + elif select == 99: + print("\n\nThank you for using Geometry Calc :)") + exit() + else: + print("[red][ERROR][/red] Invalid input. Enter again !") + question() + except ValueError: + print("[red][ERROR][/red] Value error. Enter again !") + question() + except KeyboardInterrupt: + print("\n\nThank you for using Geometry Calc :)") + exit() + question() \ No newline at end of file diff --git a/modules/SolidGeometry/Cylinder/wannaquit.py b/modules/SolidGeometry/Cylinder/wannaquit.py new file mode 100644 index 0000000..10fcd1f --- /dev/null +++ b/modules/SolidGeometry/Cylinder/wannaquit.py @@ -0,0 +1,34 @@ +from modules.clearscreen import clear +from rich import print + +def MainQuestion(): + print(""" + ________________________________________________ + What you want to do ? + + 1. Count again + 2. Go to the previous menu + 99. Exit + """) + def question(): + try: + select = int(input("Select : ")) + if select == 1: + from modules.SolidGeometry.Cylinder.execute import Execute_Cylinder + Execute_Cylinder() + elif select == 2: + print("Press [blue][/blue] to continue") + input() + elif select == 99: + print("\n\nThank you for using Geometry Calc :)") + exit() + else: + print("[red][ERROR][/red] Invalid input. Enter again !") + question() + except ValueError: + print("[red][ERROR][/red] Value error. Enter again !") + question() + except KeyboardInterrupt: + print("\n\nThank you for using Geometry Calc :)") + exit() + question() \ No newline at end of file diff --git a/modules/SolidGeometry/RectangularPrism/wannaquit.py b/modules/SolidGeometry/RectangularPrism/wannaquit.py new file mode 100644 index 0000000..e01efed --- /dev/null +++ b/modules/SolidGeometry/RectangularPrism/wannaquit.py @@ -0,0 +1,34 @@ +from modules.clearscreen import clear +from rich import print + +def MainQuestion(): + print(""" + ________________________________________________ + What you want to do ? + + 1. Count again + 2. Go to the previous menu + 99. Exit + """) + def question(): + try: + select = int(input("Select : ")) + if select == 1: + from modules.SolidGeometry.RectangularPrism.execute import Execute_RectangularPrism + Execute_RectangularPrism() + elif select == 2: + print("Press [blue][/blue] to continue") + input() + elif select == 99: + print("\n\nThank you for using Geometry Calc :)") + exit() + else: + print("[red][ERROR][/red] Invalid input. Enter again !") + question() + except ValueError: + print("[red][ERROR][/red] Value error. Enter again !") + question() + except KeyboardInterrupt: + print("\n\nThank you for using Geometry Calc :)") + exit() + question() \ No newline at end of file diff --git a/modules/SolidGeometry/Sphere/wannaquit.py b/modules/SolidGeometry/Sphere/wannaquit.py new file mode 100644 index 0000000..b760cb1 --- /dev/null +++ b/modules/SolidGeometry/Sphere/wannaquit.py @@ -0,0 +1,34 @@ +from modules.clearscreen import clear +from rich import print + +def MainQuestion(): + print(""" + ________________________________________________ + What you want to do ? + + 1. Count again + 2. Go to the previous menu + 99. Exit + """) + def question(): + try: + select = int(input("Select : ")) + if select == 1: + from modules.SolidGeometry.Sphere.execute import Execute_Sphere + Execute_Sphere() + elif select == 2: + print("Press [blue][/blue] to continue") + input() + elif select == 99: + print("\n\nThank you for using Geometry Calc :)") + exit() + else: + print("[red][ERROR][/red] Invalid input. Enter again !") + question() + except ValueError: + print("[red][ERROR][/red] Value error. Enter again !") + question() + except KeyboardInterrupt: + print("\n\nThank you for using Geometry Calc :)") + exit() + question() \ No newline at end of file From 429a1caf98a17471f2cc0931df387d68bd666eb8 Mon Sep 17 00:00:00 2001 From: Reza <65899580+bangrezz@users.noreply.github.com> Date: Wed, 14 Apr 2021 11:39:38 +0800 Subject: [PATCH 24/29] Delete LICENSE --- LICENSE | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 LICENSE diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 4821cf6..0000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2020 Reza - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. From 04867bfb64a5fe1f72e8e52d7e4ea25a801fed41 Mon Sep 17 00:00:00 2001 From: Reza <65899580+bangrezz@users.noreply.github.com> Date: Wed, 14 Apr 2021 11:42:49 +0800 Subject: [PATCH 25/29] New LICENSE --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From a55b1001fcd0ed4fc90514c54280d10b3f362be8 Mon Sep 17 00:00:00 2001 From: bangrezz Date: Thu, 15 Apr 2021 21:36:04 +0800 Subject: [PATCH 26/29] New plane geometry shape = Parallelogram --- geometry_calc.py | 7 +++- .../PlaneGeometry/Parallelogram/__init__.py | 1 + .../PlaneGeometry/Parallelogram/calculate.py | 41 +++++++++++++++++++ .../PlaneGeometry/Parallelogram/execute.py | 39 ++++++++++++++++++ .../PlaneGeometry/Parallelogram/wannaquit.py | 34 +++++++++++++++ modules/banners.py | 13 ++++-- 6 files changed, 131 insertions(+), 4 deletions(-) create mode 100644 modules/PlaneGeometry/Parallelogram/__init__.py create mode 100644 modules/PlaneGeometry/Parallelogram/calculate.py create mode 100644 modules/PlaneGeometry/Parallelogram/execute.py create mode 100644 modules/PlaneGeometry/Parallelogram/wannaquit.py diff --git a/geometry_calc.py b/geometry_calc.py index 2761d96..5457bad 100644 --- a/geometry_calc.py +++ b/geometry_calc.py @@ -4,6 +4,7 @@ from modules.PlaneGeometry.Square.execute import Execute_Square from modules.PlaneGeometry.Rectangle.execute import Execute_Rectangle from modules.PlaneGeometry.Circle.execute import Execute_Circle +from modules.PlaneGeometry.Parallelogram.execute import Execute_Parallelogram from modules.SolidGeometry.Cube.execute import Execute_Cube from modules.SolidGeometry.RectangularPrism.execute import Execute_RectangularPrism @@ -62,11 +63,15 @@ def select_planegeo_menu(): elif select_planegeo == 3: #triangle __triangle__() # go to triangle calc submenu PlaneGeo_Menu() - + elif select_planegeo == 4: #circle Execute_Circle() # calculate circle PlaneGeo_Menu() + elif select_planegeo == 5: #parallelogram + Execute_Parallelogram() + PlaneGeo_Menu() + elif select_planegeo == 99: clear() MainMenu() diff --git a/modules/PlaneGeometry/Parallelogram/__init__.py b/modules/PlaneGeometry/Parallelogram/__init__.py new file mode 100644 index 0000000..3cc762b --- /dev/null +++ b/modules/PlaneGeometry/Parallelogram/__init__.py @@ -0,0 +1 @@ +"" \ No newline at end of file diff --git a/modules/PlaneGeometry/Parallelogram/calculate.py b/modules/PlaneGeometry/Parallelogram/calculate.py new file mode 100644 index 0000000..de288a0 --- /dev/null +++ b/modules/PlaneGeometry/Parallelogram/calculate.py @@ -0,0 +1,41 @@ +#parallelogram + +class Parallelogram: + def __init__(self, base, height): + self.b = base + self.h = height + + def Calculating_Area(self): + global area + area = self.b * self.h + return area + + def Calculating_Perimeter(self): + global perimeter + perimeter = 2 * (self.b + self.h) + return perimeter + + def Result(self): + res = f"""\n + ---------------------------------------------- + CALCULATE + ---------------------------------------------- + + Base (b) = {self.b} cm + + Height (h) = {self.h} cm + + Formula the parallelogram + perimeter = 2 (b + h) + = 2 ({self.b} cm + {self.h} cm) + + Formula the parallelogram area = b * h + = {self.b} cm * {self.h} cm + + --------------------RESULT-------------------- + + Parallelogram perimeter = {perimeter} cm + + Parallelogram area = {area} cm^2 + """ + return res \ No newline at end of file diff --git a/modules/PlaneGeometry/Parallelogram/execute.py b/modules/PlaneGeometry/Parallelogram/execute.py new file mode 100644 index 0000000..d05a872 --- /dev/null +++ b/modules/PlaneGeometry/Parallelogram/execute.py @@ -0,0 +1,39 @@ +# execute parralelogram +from modules.clearscreen import clear +from modules.PlaneGeometry.Parallelogram.calculate import Parallelogram +from modules.banners import parallelogram_banner +from modules.PlaneGeometry.Parallelogram.wannaquit import MainQuestion + +def Execute_Parallelogram(): + clear() + parallelogram_banner() + print("Calculate area and perimeter of the parallelogram") + #initiating + def Input_Base(): #input base length + try: + global Base + Base = float(input("\nEnter base length (b) = ")) + if Base <= 0:print("[ERROR] The value must greater than 0 !");Input_Base() + except ValueError: + print("[ERROR] Enter again !") + Input_Base() + except KeyboardInterrupt: + print("\n\nThank you for using Geometry Calc :)") + exit() + Input_Base() #return to Input_Base() + def Input_Height(): #input height length + try: + global Height + Height = float(input("\nEnter height length (h) = ")) + if Height <= 0:print("[ERROR] The value must greater than 0 !");Input_Height() + except ValueError: + print("[ERROR] Enter again !") + Input_Height() + except KeyboardInterrupt: + print("\n\nThank you for using Geometry Calc :)") + exit() + Input_Height() #return to Input_Height() + ExecParallelogram = Parallelogram(Base, Height) + ExecParallelogram.Calculating_Area();ExecParallelogram.Calculating_Perimeter() + result = ExecParallelogram.Result();print(result) + MainQuestion() \ No newline at end of file diff --git a/modules/PlaneGeometry/Parallelogram/wannaquit.py b/modules/PlaneGeometry/Parallelogram/wannaquit.py new file mode 100644 index 0000000..5180133 --- /dev/null +++ b/modules/PlaneGeometry/Parallelogram/wannaquit.py @@ -0,0 +1,34 @@ +from modules.clearscreen import clear +from rich import print + +def MainQuestion(): + print(""" + ________________________________________________ + What you want to do ? + + 1. Count again + 2. Go to the previous menu + 99. Exit + """) + def question(): + try: + select = int(input("Select : ")) + if select == 1: + from modules.PlaneGeometry.Parallelogram.execute import Execute_Parallelogram + Execute_Parallelogram() + elif select == 2: + print("Press [blue][/blue] to continue") + input() + elif select == 99: + print("\n\nThank you for using Geometry Calc :)") + exit() + else: + print("[red][ERROR][/red] Invalid input. Enter again !") + question() + except ValueError: + print("[red][ERROR][/red] Value error. Enter again !") + question() + except KeyboardInterrupt: + print("\n\nThank you for using Geometry Calc :)") + exit() + question() \ No newline at end of file diff --git a/modules/banners.py b/modules/banners.py index da040fd..cb21a95 100644 --- a/modules/banners.py +++ b/modules/banners.py @@ -10,7 +10,7 @@ def main_banner(): print(colorama.Fore.LIGHTGREEN_EX, textbanner) # set textbanner color to light green print(colorama.Fore.RESET) #for reset color to default maintext = """ - [Version : 1.0.0] + [Version : 1.0.1] Geometry calculator for calculate 2D plane and 3D solid geometry shapes. @@ -36,7 +36,7 @@ def PlaneGeo_banner(): print(colorama.Fore.LIGHTCYAN_EX, textbanner) # set textbanner color to light green print(colorama.Fore.RESET) #for reset color to default planeGeo_text = """ - [Version : 1.0.0] + [Version : 1.0.1] Geometry calculator for calculate 2D plane and 3D solid geometry shapes. @@ -52,6 +52,7 @@ def PlaneGeo_banner(): 2. Rectangle 3. Triangle 4. Circle + 5. Parallelogram 99. Go back to the previous menu """ @@ -63,7 +64,7 @@ def SolidGeo_banner(): print(colorama.Fore.LIGHTYELLOW_EX, textbanner) # set textbanner color to light green print(colorama.Fore.RESET) #for reset color to default solidGeo_text = """ - [Version : 1.0.0] + [Version : 1.0.1] Geometry calculator for calculate 2D plane and 3D solid geometry shapes. @@ -138,6 +139,12 @@ def circle_banner(): textbanner = (fontsbanner.renderText("Circle")) print(colorama.Fore.LIGHTMAGENTA_EX, textbanner) # set textbanner color print(colorama.Fore.RESET) #for reset color to default + +def parallelogram_banner(): + fontsbanner = Figlet(font='slant') + textbanner = (fontsbanner.renderText("Parallelogram")) + print(colorama.Fore.LIGHTMAGENTA_EX, textbanner) # set textbanner color + print(colorama.Fore.RESET) #for reset color to default """ Solid Geometry banners | From 7ab89f09ff4ab705ffd460433c96f10daba73abc Mon Sep 17 00:00:00 2001 From: bangrezz Date: Thu, 15 Apr 2021 21:37:00 +0800 Subject: [PATCH 27/29] Update informations --- README.md | 1 + modules/about.py | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index fb3af43..86dc6f9 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,7 @@ python3 geometry_calc.py - Square - Triangle (included pythagorean) - Circle [NEW] + - Parallelogram [NEW] - Solid geometry - Cube - Rectangular prism diff --git a/modules/about.py b/modules/about.py index d7d201c..aa972a9 100644 --- a/modules/about.py +++ b/modules/about.py @@ -51,6 +51,7 @@ def printabout(): - Square - Triangle (included pythagorean) - Circle [NEW] + - Parallelogram [NEW] - Solid geometry - Cube - Rectangular prism From ef3dea803034d30e20985cce90972c25945366c2 Mon Sep 17 00:00:00 2001 From: bangrezz Date: Thu, 15 Apr 2021 21:38:12 +0800 Subject: [PATCH 28/29] Update files --- modules/PlaneGeometry/Circle/calculate.py | 4 ++-- modules/SolidGeometry/RectangularPrism/calculate.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/PlaneGeometry/Circle/calculate.py b/modules/PlaneGeometry/Circle/calculate.py index 028513c..154bc64 100644 --- a/modules/PlaneGeometry/Circle/calculate.py +++ b/modules/PlaneGeometry/Circle/calculate.py @@ -25,7 +25,7 @@ def Result(self): Pi value (π) = {self.PI} - Formula the circle perimeter = 2 * π * r + Formula the circle circumference = 2 * π * r = 2 * {self.PI} * {self.r} cm Formula the circle area = π * r^2 @@ -33,7 +33,7 @@ def Result(self): --------------------RESULT-------------------- - Circle perimeter = {perimeter} cm + Circle circumference = {perimeter} cm Circle area = {area} cm^2 """ diff --git a/modules/SolidGeometry/RectangularPrism/calculate.py b/modules/SolidGeometry/RectangularPrism/calculate.py index e521976..fa501a1 100644 --- a/modules/SolidGeometry/RectangularPrism/calculate.py +++ b/modules/SolidGeometry/RectangularPrism/calculate.py @@ -40,6 +40,6 @@ def Result(self): Rectangular prism surface area = {surface_area} cm^2 - Rectangular prism volume = {volume} cm^3 + Rectangular prism volume = {volume} cm^3 """ return res \ No newline at end of file From 1b730bba5b403032107f958eccf9f6d67b92f8ee Mon Sep 17 00:00:00 2001 From: bangrezz Date: Thu, 15 Apr 2021 21:49:29 +0800 Subject: [PATCH 29/29] More colorful text --- modules/PlaneGeometry/Circle/execute.py | 12 ++-- .../PlaneGeometry/Parallelogram/execute.py | 9 +-- .../PlaneGeometry/Parallelogram/wannaquit.py | 2 +- modules/PlaneGeometry/Rectangle/execute.py | 15 ++--- modules/PlaneGeometry/Rectangle/wannaquit.py | 2 +- modules/PlaneGeometry/Square/execute.py | 5 +- modules/PlaneGeometry/Square/wannaquit.py | 2 +- modules/PlaneGeometry/Triangle/execute.py | 55 +++++++++---------- modules/PlaneGeometry/Triangle/menu.py | 9 +-- modules/PlaneGeometry/Triangle/wannaquit.py | 39 ++++++------- modules/SolidGeometry/Cube/execute.py | 5 +- modules/SolidGeometry/Cube/wannaquit.py | 2 +- modules/SolidGeometry/Cylinder/execute.py | 20 +++---- modules/SolidGeometry/Cylinder/wannaquit.py | 2 +- .../SolidGeometry/RectangularPrism/execute.py | 19 ++++--- .../RectangularPrism/wannaquit.py | 2 +- modules/SolidGeometry/Sphere/execute.py | 12 ++-- modules/SolidGeometry/Sphere/wannaquit.py | 2 +- 18 files changed, 105 insertions(+), 109 deletions(-) diff --git a/modules/PlaneGeometry/Circle/execute.py b/modules/PlaneGeometry/Circle/execute.py index 683d3f1..0d4f544 100644 --- a/modules/PlaneGeometry/Circle/execute.py +++ b/modules/PlaneGeometry/Circle/execute.py @@ -3,6 +3,7 @@ from modules.PlaneGeometry.Circle.calculate import Circle from modules.banners import circle_banner from modules.PlaneGeometry.Circle.wannaquit import MainQuestion +from rich import print def Execute_Circle(): clear() @@ -13,9 +14,9 @@ def Input_radius(): #input side length try: global radius radius = float(input("\nEnter radius length (r) = ")) - if radius <= 0:print("[ERROR] The value must greater than 0 !");Input_radius() + if radius <= 0:print("[red][ERROR][/red] Invalid value. The value must greater than 0 !");Input_radius() except ValueError: - print("[ERROR] Enter again !") + print("[red][ERROR][/red] Value error. Enter again !") Input_radius() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") @@ -28,13 +29,10 @@ def Input_pi(): select_pi = input("\nUsing pi (π) default value : 3.14 ? [y/n] = ") if select_pi == 'y':PI = 3.14 # set default pi value to 3.14 elif select_pi == 'n': - print("""\n\n[NOTE] pi value must 3.14. But, you can custom decimal value of pi. + print("""\n\n[green][NOTE][/green] pi value must 3.14. But, you can custom decimal value of pi. Example : 3.14159""") PI = float(input("\nEnter custom pi value (π) = ")) - else:print("\n[ERROR] Please enter correctly");Input_pi() - except ValueError: - print("[ERROR] Enter again !") - Input_pi() + else:print("\n[red][ERROR][/red] Please enter correctly");Input_pi() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") exit() diff --git a/modules/PlaneGeometry/Parallelogram/execute.py b/modules/PlaneGeometry/Parallelogram/execute.py index d05a872..7de8e4c 100644 --- a/modules/PlaneGeometry/Parallelogram/execute.py +++ b/modules/PlaneGeometry/Parallelogram/execute.py @@ -3,6 +3,7 @@ from modules.PlaneGeometry.Parallelogram.calculate import Parallelogram from modules.banners import parallelogram_banner from modules.PlaneGeometry.Parallelogram.wannaquit import MainQuestion +from rich import print def Execute_Parallelogram(): clear() @@ -13,9 +14,9 @@ def Input_Base(): #input base length try: global Base Base = float(input("\nEnter base length (b) = ")) - if Base <= 0:print("[ERROR] The value must greater than 0 !");Input_Base() + if Base <= 0:print("[red][ERROR][/red] Invalid value. The value must greater than 0 !");Input_Base() except ValueError: - print("[ERROR] Enter again !") + print("[red][ERROR][/red] Value error. Enter again !") Input_Base() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") @@ -25,9 +26,9 @@ def Input_Height(): #input height length try: global Height Height = float(input("\nEnter height length (h) = ")) - if Height <= 0:print("[ERROR] The value must greater than 0 !");Input_Height() + if Height <= 0:print("[red][ERROR][/red] Invalid value. The value must greater than 0 !");Input_Height() except ValueError: - print("[ERROR] Enter again !") + print("[red][ERROR][/red] Value error. Enter again !") Input_Height() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") diff --git a/modules/PlaneGeometry/Parallelogram/wannaquit.py b/modules/PlaneGeometry/Parallelogram/wannaquit.py index 5180133..0e58e55 100644 --- a/modules/PlaneGeometry/Parallelogram/wannaquit.py +++ b/modules/PlaneGeometry/Parallelogram/wannaquit.py @@ -17,7 +17,7 @@ def question(): from modules.PlaneGeometry.Parallelogram.execute import Execute_Parallelogram Execute_Parallelogram() elif select == 2: - print("Press [blue][/blue] to continue") + print("Press [magenta][/magenta] to continue") input() elif select == 99: print("\n\nThank you for using Geometry Calc :)") diff --git a/modules/PlaneGeometry/Rectangle/execute.py b/modules/PlaneGeometry/Rectangle/execute.py index 8a36d7f..8d639e9 100644 --- a/modules/PlaneGeometry/Rectangle/execute.py +++ b/modules/PlaneGeometry/Rectangle/execute.py @@ -4,6 +4,7 @@ from modules.PlaneGeometry.Rectangle.calculate import Rectangle from modules.banners import rectangle_banner from modules.PlaneGeometry.Rectangle.wannaquit import MainQuestion +from rich import print def Execute_Rectangle(): clear() @@ -14,9 +15,9 @@ def Input_length(): try: global length length = float(input("\nEnter length (l) = ")) - if length <= 0:print("[ERROR] The value must greater than 0 !");Input_length() + if length <= 0:print("[red][ERROR][/red] Invalid value. The value must greater than 0 !");Input_length() except ValueError: - print("[ERROR] Enter again !") + print("[red][ERROR][/red] Value error. Enter again !") Input_length() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") @@ -26,24 +27,24 @@ def Input_width(): try: global width width = float(input("\nEnter width (w) = ")) - if width <= 0:print("[ERROR] The value must greater than 0 !");Input_width() + if width <= 0:print("[red][ERROR][/red] Invalid value. The value must greater than 0 !");Input_width() except ValueError: - print("[ERROR] Enter again !") + print("[red][ERROR][/red] Value error. Enter again !") Input_width() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") exit() Input_width() if length == width: - print("\n[WARN] The rectangle is a square. Because the length value as same as the width value.") + print(f"\n[yellow][WARN][/yellow] The rectangle is a square. Because the length value ({length}) as same as the width value ({width}).") def width_sameAs_length(): select = input("Are you sure to continue ? [y/n] : ") if select=='y':pass elif select=='n': - input("\nPress to go to repeat enter value\n") + print("\nPress [magenta][/magenta] to go to repeat enter value\n");input() rectangle_banner();print("Calculate Rectangle Area & Perimeter") Input_length();Input_width() - else:print("\n[ERROR] Please enter correctly");width_sameAs_length() + else:print("\n[red][ERROR][/red] Please enter correctly");width_sameAs_length() width_sameAs_length() ExecRectangle = Rectangle(length,width) ExecRectangle.Calculating_Area();ExecRectangle.Calculating_Perimeter() diff --git a/modules/PlaneGeometry/Rectangle/wannaquit.py b/modules/PlaneGeometry/Rectangle/wannaquit.py index 2c4a4e5..a58299b 100644 --- a/modules/PlaneGeometry/Rectangle/wannaquit.py +++ b/modules/PlaneGeometry/Rectangle/wannaquit.py @@ -17,7 +17,7 @@ def question(): from modules.PlaneGeometry.Rectangle.execute import Execute_Rectangle Execute_Rectangle() elif select == 2: - print("Press [blue][/blue] to continue") + print("Press [magenta][/magenta] to continue") input() elif select == 99: print("\n\nThank you for using Geometry Calc :)") diff --git a/modules/PlaneGeometry/Square/execute.py b/modules/PlaneGeometry/Square/execute.py index c19e0ef..3f3cc7d 100644 --- a/modules/PlaneGeometry/Square/execute.py +++ b/modules/PlaneGeometry/Square/execute.py @@ -3,6 +3,7 @@ from modules.PlaneGeometry.Square.calculate import Square from modules.banners import square_banner from modules.PlaneGeometry.Square.wannaquit import MainQuestion +from rich import print def Execute_Square(): clear() @@ -13,9 +14,9 @@ def Input_side(): #input side length try: global side side = float(input("\nEnter side length (s) = ")) - if side <= 0:print("[ERROR] The value must greater than 0 !");Input_side() + if side <= 0:print("[red][ERROR][/red] Invalid value. The value must greater than 0 !");Input_side() except ValueError: - print("[ERROR] Enter again !") + print("[red][ERROR][/red] Value error. Enter again !") Input_side() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") diff --git a/modules/PlaneGeometry/Square/wannaquit.py b/modules/PlaneGeometry/Square/wannaquit.py index c53e0b8..0c05fda 100644 --- a/modules/PlaneGeometry/Square/wannaquit.py +++ b/modules/PlaneGeometry/Square/wannaquit.py @@ -17,7 +17,7 @@ def question(): from modules.PlaneGeometry.Square.execute import Execute_Square Execute_Square() elif select == 2: - print("Press [blue][/blue] to continue") + print("Press [magenta][/magenta] to continue") input() elif select == 99: print("\n\nThank you for using Geometry Calc :)") diff --git a/modules/PlaneGeometry/Triangle/execute.py b/modules/PlaneGeometry/Triangle/execute.py index b1f9789..cd92eb5 100644 --- a/modules/PlaneGeometry/Triangle/execute.py +++ b/modules/PlaneGeometry/Triangle/execute.py @@ -4,6 +4,7 @@ from modules.PlaneGeometry.Triangle.calculate import TriangleArea, TrianglePerimeter from modules.PlaneGeometry.Triangle.pythagorean import Pythagorean_Side_a, Pythagorean_Side_b, Pythagorean_Hypotenuse from modules.PlaneGeometry.Triangle.wannaquit import TriangleQuestion, PythagoreanQuestion +from rich import print def Execute_Area(): clear() @@ -12,9 +13,9 @@ def Input_Base(): #input base length try: global Base Base = float(input("\nEnter base length (b) = ")) - if Base <= 0:print("[ERROR] The value must greater than 0 !");Input_Base() + if Base <= 0:print("[red][ERROR][/red] Invalid value. The value must greater than 0 !");Input_Base() except ValueError: - print("[ERROR] Enter again !") + print("[red][ERROR][/red] Value error. Enter again !") Input_Base() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") @@ -24,9 +25,9 @@ def Input_Height(): #input height length try: global Height Height = float(input("\nEnter height length (h) = ")) - if Height <= 0:print("[ERROR] The value must greater than 0 !");Input_Height() + if Height <= 0:print("[red][ERROR][/red] Invalid value. The value must greater than 0 !");Input_Height() except ValueError: - print("[ERROR] Enter again !") + print("[red][ERROR][/red] Value error. Enter again !") Input_Height() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") @@ -48,9 +49,9 @@ def Input_side_a(): #side a try: global a a = float(input("\nEnter the length of side a = ")) - if a <= 0:print("[ERROR] The value must greater than 0 !");Input_side_a() + if a <= 0:print("[red][ERROR][/red] Invalid value. The value must greater than 0 !");Input_side_a() except ValueError: - print("[ERROR] Enter again !") + print("[red][ERROR][/red] Value error. Enter again !") Input_side_a() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") @@ -60,9 +61,9 @@ def Input_side_b(): #side b try: global b b = float(input("\nEnter the length of side b = ")) - if b <= 0:print("[ERROR] The value must greater than 0 !");Input_side_b() + if b <= 0:print("[red][ERROR][/red] Invalid value. The value must greater than 0 !");Input_side_b() except ValueError: - print("[ERROR] Enter again !") + print("[red][ERROR][/red] Value error. Enter again !") Input_side_b() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") @@ -72,9 +73,9 @@ def Input_side_c(): #side c try: global c c = float(input("\nEnter the length of side c = ")) - if c <= 0:print("[ERROR] The value must greater than 0 !");Input_side_c() + if c <= 0:print("[red][ERROR][/red] Invalid value. The value must greater than 0 !");Input_side_c() except ValueError: - print("[ERROR] Enter again !") + print("[red][ERROR][/red] Value error. Enter again !") Input_side_c() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") @@ -97,9 +98,9 @@ def Input_side_b(): # side b try: global b b = float(input("\nEnter the length of side b = ")) - if b <= 0:print("[ERROR] The value must greater than 0 !");Input_side_b() + if b <= 0:print("[red][ERROR][/red] Invalid value. The value must greater than 0 !");Input_side_b() except ValueError: - print("[ERROR] Enter again !") + print("[red][ERROR][/red] Value error. Enter again !") Input_side_b() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") @@ -109,14 +110,13 @@ def Input_side_c(): #side hypotenuse c try: global c c = float(input("\nEnter the length of side hypotenuse (c) = ")) - if c <= 0:print("[ERROR] The value must greater than 0 !");Input_side_c() + if c <= 0:print("[red][ERROR][/red] Invalid value. The value must greater than 0 !");Input_side_c() if c <= b: - print("\n[ERROR] The value of side hypotenuse (c) must greater than side b. Please repeat again !") - input("Press to continue\n\n") - print("--- Find Side A of Pythagorean ---") + print("\n[red][ERROR][/red] The value of side hypotenuse (c) must greater than side b. Please repeat again !") + print("Press [magenta][/magenta] to continue\n");input() Input_side_b();Input_side_c() except ValueError: - print("[ERROR] Enter again !") + print("[red][ERROR][/red] Value error. Enter again !") Input_side_c() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") @@ -137,9 +137,9 @@ def Input_side_a(): #side a try: global a a = float(input("\nEnter the length of side a = ")) - if a <= 0:print("[ERROR] The value must greater than 0 !");Input_side_a() + if a <= 0:print("[red][ERROR][/red] Invalid value. The value must greater than 0 !");Input_side_a() except ValueError: - print("[ERROR] Enter again !") + print("[red][ERROR][/red] Value error. Enter again !") Input_side_a() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") @@ -149,14 +149,13 @@ def Input_side_c(): #side hypotenuse c try: global c c = float(input("\nEnter the length of side hypotenuse (c) = ")) - if c <= 0:print("[ERROR] The value must greater than 0 !");Input_side_c() + if c <= 0:print("[red][ERROR][/red] Invalid value. The value must greater than 0 !");Input_side_c() if c <= a: - print("\n[ERROR] The value of side hypotenuse (c) must greater than side a. Please repeat again !") - input("Press to continue\n\n") - print("--- Find Side B of Pythagorean ---") + print("\n[red][ERROR][/red] The value of side hypotenuse (c) must greater than side a. Please repeat again !") + print("Press [magenta][/magenta] to continue\n\n");input() Input_side_a();Input_side_c() except ValueError: - print("[ERROR] Enter again !") + print("[red][ERROR][/red] Value error. Enter again !") Input_side_c() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") @@ -177,9 +176,9 @@ def Input_side_a(): #side a try: global a a = float(input("\nEnter the length of side a = ")) - if a <= 0:print("[ERROR] The value must greater than 0 !");Input_side_a() + if a <= 0:print("[red][ERROR][/red] Invalid value. The value must greater than 0 !");Input_side_a() except ValueError: - print("[ERROR] Enter again !") + print("[red][ERROR][/red] Value error. Enter again !") Input_side_a() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") @@ -189,9 +188,9 @@ def Input_side_b(): # side b try: global b b = float(input("\nEnter the length of side b = ")) - if b <= 0:print("[ERROR] The value must greater than 0 !");Input_side_b() + if b <= 0:print("[red][ERROR][/red] Invalid value. The value must greater than 0 !");Input_side_b() except ValueError: - print("[ERROR] Enter again !") + print("[red][ERROR][/red] Value error. Enter again !") Input_side_b() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") diff --git a/modules/PlaneGeometry/Triangle/menu.py b/modules/PlaneGeometry/Triangle/menu.py index f66548b..861c3fc 100644 --- a/modules/PlaneGeometry/Triangle/menu.py +++ b/modules/PlaneGeometry/Triangle/menu.py @@ -1,6 +1,7 @@ from modules.clearscreen import clear from modules.PlaneGeometry.Triangle.execute import Execute_Area, Execute_Perimeter, Execute_Pythagorean from modules.banners import triangle_banner, pythagorean_banner +from rich import print # pythagorean main menu, triangle submenu def __pythagorean__(): @@ -21,10 +22,10 @@ def select_pythagorean(): elif select_menu == 99: clear() else: - print("\n\t [ERROR] Select the menu correctly !") + print("\n\t [red][ERROR][/red] Select the menu correctly !") select_pythagorean() except ValueError: - print("\n\t [ERROR] Your selection is invalid. Repeat again !") + print("\n\t [red][ERROR][/red] Your selection is invalid. Repeat again !") select_pythagorean() except KeyboardInterrupt: print("\n\n\t Thank you for using Geometry Calc :)") @@ -51,10 +52,10 @@ def select_triangle(): elif select_menu == 99: clear() # go to Plane Geometry main menu else: - print("\n\t [ERROR] Select the menu correctly !") + print("\n\t [red][ERROR][/red] Select the menu correctly !") select_triangle() except ValueError: - print("\n\t [ERROR] Your selection is invalid. Repeat again !") + print("\n\t [red][ERROR][/red] Your selection is invalid. Repeat again !") select_triangle() except KeyboardInterrupt: print("\n\n\t Thank you for using Geometry Calc :)") diff --git a/modules/PlaneGeometry/Triangle/wannaquit.py b/modules/PlaneGeometry/Triangle/wannaquit.py index 6a5c34e..dd60a71 100644 --- a/modules/PlaneGeometry/Triangle/wannaquit.py +++ b/modules/PlaneGeometry/Triangle/wannaquit.py @@ -4,12 +4,12 @@ class TriangleQuestion: def AreaQuestion(self): print(""" - ________________________________________________ - What you want to do ? - - 1. Count again - 2. Go to the previous menu - 99. Exit + ______________________________________________ + What you want to do ? + + 1. Count again + 2. Go to the previous menu + 99. Exit """) def select_question(): try: @@ -18,7 +18,7 @@ def select_question(): from modules.PlaneGeometry.Triangle.execute import Execute_Area Execute_Area() elif select == 2: - print("Press [blue][/blue] to continue") + print("Press [magenta][/magenta] to continue") input() elif select == 99: print("\n\nThank you for using Geometry Calc :)") @@ -36,12 +36,12 @@ def select_question(): def PerimeterQuestion(self): print(""" - ________________________________________________ - What you want to do ? - - 1. Count again - 2. Go to the previous menu - 99. Exit + ________________________________________________ + What you want to do ? + + 1. Count again + 2. Go to the previous menu + 99. Exit """) def select_question(): try: @@ -50,7 +50,7 @@ def select_question(): from modules.PlaneGeometry.Triangle.execute import Execute_Perimeter Execute_Perimeter() elif select == 2: - print("Press [blue][/blue] to continue") + print("Press [magenta][/magenta] to continue") input() elif select == 99: print("\n\nThank you for using Geometry Calc :)") @@ -84,8 +84,7 @@ def select_question(): side_a = Execute_Pythagorean() side_a.Execute_side_a() elif select == 2: - print("Press [blue][/blue] to continue") - input() + print("Press [magenta][/magenta] to continue");input() elif select == 99: print("\n\nThank you for using Geometry Calc :)") exit() @@ -115,10 +114,9 @@ def select_question(): if select == 1: from modules.PlaneGeometry.Triangle.execute import Execute_Pythagorean side_b = Execute_Pythagorean() - side_b.Execute_side_b + side_b.Execute_side_b() elif select == 2: - print("Press [blue][/blue] to continue") - input() + print("Press [magenta][/magenta] to continue");input() elif select == 99: print("\n\nThank you for using Geometry Calc :)") exit() @@ -150,8 +148,7 @@ def select_question(): side_c = Execute_Pythagorean() side_c.Execute_Hypotenuse() elif select == 2: - print("Press [blue][/blue] to continue") - input() + print("Press [magenta][/magenta] to continue");input() elif select == 99: print("\n\nThank you for using Geometry Calc :)") exit() diff --git a/modules/SolidGeometry/Cube/execute.py b/modules/SolidGeometry/Cube/execute.py index 75e61f0..af8b320 100644 --- a/modules/SolidGeometry/Cube/execute.py +++ b/modules/SolidGeometry/Cube/execute.py @@ -4,6 +4,7 @@ from modules.SolidGeometry.Cube.calculate import Cube from modules.banners import cube_banner from modules.SolidGeometry.Cube.wannaquit import MainQuestion +from rich import print def Execute_Cube(): clear() @@ -14,9 +15,9 @@ def Input_side(): #input side length try: global side side = float(input("\nEnter side length (s) = ")) - if side <= 0:print("[ERROR] The value must greater than 0 !");Input_side() + if side <= 0:print("[red][ERROR][/red] Invalid value. The value must greater than 0 !");Input_side() except ValueError: - print("[ERROR] Enter again !") + print("[red][ERROR][/red] Value error. Enter again !") Input_side() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") diff --git a/modules/SolidGeometry/Cube/wannaquit.py b/modules/SolidGeometry/Cube/wannaquit.py index 102e0f6..1edad62 100644 --- a/modules/SolidGeometry/Cube/wannaquit.py +++ b/modules/SolidGeometry/Cube/wannaquit.py @@ -17,7 +17,7 @@ def question(): from modules.SolidGeometry.Cube.execute import Execute_Cube Execute_Cube() elif select == 2: - print("Press [blue][/blue] to continue") + print("Press [magenta][/magenta] to continue") input() elif select == 99: print("\n\nThank you for using Geometry Calc :)") diff --git a/modules/SolidGeometry/Cylinder/execute.py b/modules/SolidGeometry/Cylinder/execute.py index 0ec82db..4918fcf 100644 --- a/modules/SolidGeometry/Cylinder/execute.py +++ b/modules/SolidGeometry/Cylinder/execute.py @@ -4,19 +4,20 @@ from modules.SolidGeometry.Cylinder.calculate import Cylinder from modules.banners import cylinder_banner from modules.SolidGeometry.Cylinder.wannaquit import MainQuestion +from rich import print def Execute_Cylinder(): clear() cylinder_banner() - print("\"Calculate surface area and volume of the cylinder\"") + print("Calculate surface area and volume of the cylinder") #initiating def Input_radius(): try: global radius radius = float(input("\nEnter radius length (r) = ")) - if radius <= 0:print("[ERROR] The value must greater than 0 !");Input_radius() + if radius <= 0:print("[red][ERROR][/red] Invalid value. The value must greater than 0 !");Input_radius() except ValueError: - print("[ERROR] Enter again !") + print("[red][ERROR][/red] Value error. Enter again !") Input_radius() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") @@ -26,10 +27,10 @@ def Input_height(): try: global height height = float(input("\nEnter height length (h) = ")) - if height <= 0:print("[ERROR] The value must greater than 0 !");Input_height() + if height <= 0:print("[red][ERROR][/red] Invalid value. The value must greater than 0 !");Input_height() except ValueError: - print("[ERROR] Enter again !") - Input_radius() + print("[red][ERROR][/red] Value error. Enter again !") + Input_height() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") exit() @@ -41,13 +42,10 @@ def Input_pi(): select_pi = input("\nUsing pi (π) default value : 3.14 ? [y/n] = ") if select_pi == 'y':PI = 3.14 # set default pi value to 3.14 elif select_pi == 'n': - print("""\n\n[NOTE] pi value must 3.14. But, you can custom decimal value of pi. + print("""\n\n[green][NOTE][/green] pi value must 3.14. But, you can custom decimal value of pi. Example : 3.14159""") PI = float(input("\nEnter custom pi value (π) = ")) - else:print("\n[ERROR] Please enter correctly");Input_pi() - except ValueError: - print("[ERROR] Enter again !") - Input_pi() + else:print("\n[red][ERROR][/red] Please enter correctly");Input_pi() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") exit() diff --git a/modules/SolidGeometry/Cylinder/wannaquit.py b/modules/SolidGeometry/Cylinder/wannaquit.py index 10fcd1f..5b580e2 100644 --- a/modules/SolidGeometry/Cylinder/wannaquit.py +++ b/modules/SolidGeometry/Cylinder/wannaquit.py @@ -17,7 +17,7 @@ def question(): from modules.SolidGeometry.Cylinder.execute import Execute_Cylinder Execute_Cylinder() elif select == 2: - print("Press [blue][/blue] to continue") + print("Press [magenta][/magenta] to continue") input() elif select == 99: print("\n\nThank you for using Geometry Calc :)") diff --git a/modules/SolidGeometry/RectangularPrism/execute.py b/modules/SolidGeometry/RectangularPrism/execute.py index 64f5955..c22e9dd 100644 --- a/modules/SolidGeometry/RectangularPrism/execute.py +++ b/modules/SolidGeometry/RectangularPrism/execute.py @@ -4,6 +4,7 @@ from modules.SolidGeometry.RectangularPrism.calculate import RectangularPrism from modules.banners import rectangularprism_banner from modules.SolidGeometry.RectangularPrism.wannaquit import MainQuestion +from rich import print def Execute_RectangularPrism(): clear() @@ -14,9 +15,9 @@ def Input_length(): try: global length length = float(input("\nEnter length (l) = ")) - if length <= 0:print("[ERROR] The value must greater than 0 !");Input_length() + if length <= 0:print("[red][ERROR][/red] Invalid value. The value must greater than 0 !");Input_length() except ValueError: - print("[ERROR] Enter again !") + print("[red][ERROR][/red] Value error. Enter again !") Input_length() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") @@ -26,9 +27,9 @@ def Input_width(): try: global width width = float(input("\nEnter width (w) = ")) - if width <= 0:print("[ERROR] The value must greater than 0 !");Input_width() + if width <= 0:print("[red][ERROR][/red] Invalid value. The value must greater than 0 !");Input_width() except ValueError: - print("[ERROR] Enter again !") + print("[red][ERROR][/red] Value error. Enter again !") Input_width() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") @@ -38,24 +39,24 @@ def Input_height(): try: global height height = float(input("\nEnter height (h) = ")) - if height <= 0:print("[ERROR] The value must greater than 0 !");Input_height() + if height <= 0:print("[red][ERROR][/red] Invalid value. The value must greater than 0 !");Input_height() except ValueError: - print("[ERROR] Enter again !") + print("[red][ERROR][/red] Value error. Enter again !") Input_height() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") exit() Input_height() if length == width == height: - print("\n[WARN] The rectangular prism is a cube. Because the length, width, and height value are same.") + print("\n[yellow][WARN][/yellow] The rectangular prism is a cube. Because the length, width, and height value are same.") def same_value(): select = input("Are you sure to continue ? [y/n] : ") if select=='y':pass elif select=='n': - input("\nPress to go to repeat enter value\n") + print("\nPress [magenta][/magenta] to go to repeat enter value\n");input() rectangularprism_banner();print("Calculate Rectangular Prism Surface Area & Volume") Input_length();Input_width();Input_height() - else:print("\n[ERROR] Please enter correctly");same_value() + else:print("\n[red][ERROR][/red] Please enter correctly");same_value() same_value() ExecRectangularPrism = RectangularPrism(length,width,height) ExecRectangularPrism.Calculating_Volume();ExecRectangularPrism.Calculating_SurfaceArea() diff --git a/modules/SolidGeometry/RectangularPrism/wannaquit.py b/modules/SolidGeometry/RectangularPrism/wannaquit.py index e01efed..8386892 100644 --- a/modules/SolidGeometry/RectangularPrism/wannaquit.py +++ b/modules/SolidGeometry/RectangularPrism/wannaquit.py @@ -17,7 +17,7 @@ def question(): from modules.SolidGeometry.RectangularPrism.execute import Execute_RectangularPrism Execute_RectangularPrism() elif select == 2: - print("Press [blue][/blue] to continue") + print("Press [magenta][/magenta] to continue") input() elif select == 99: print("\n\nThank you for using Geometry Calc :)") diff --git a/modules/SolidGeometry/Sphere/execute.py b/modules/SolidGeometry/Sphere/execute.py index 215ae09..87597cb 100644 --- a/modules/SolidGeometry/Sphere/execute.py +++ b/modules/SolidGeometry/Sphere/execute.py @@ -4,6 +4,7 @@ from modules.SolidGeometry.Sphere.calculate import Sphere from modules.banners import sphere_banner from modules.SolidGeometry.Sphere.wannaquit import MainQuestion +from rich import print def Execute_Sphere(): clear() @@ -14,9 +15,9 @@ def Input_radius(): try: global radius radius = float(input("\nEnter radius length (r) = ")) - if radius <= 0:print("[ERROR] The value must greater than 0 !");Input_radius() + if radius <= 0:print("[red][ERROR][/red] Invalid value. The value must greater than 0 !");Input_radius() except ValueError: - print("[ERROR] Enter again !") + print("[red][ERROR][/red] Value error. Enter again !") Input_radius() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") @@ -29,13 +30,10 @@ def Input_pi(): select_pi = input("\nUsing pi (π) default value : 3.14 ? [y/n] = ") if select_pi == 'y':PI = 3.14 # set default pi value to 3.14 elif select_pi == 'n': - print("""\n\n[NOTE] pi value must 3.14. But, you can custom decimal value of pi. + print("""\n\n[green][NOTE][/green] pi value must 3.14. But, you can custom decimal value of pi. Example : 3.14159""") PI = float(input("\nEnter custom pi value (π) = ")) - else:print("\n[ERROR] Please enter correctly");Input_pi() - except ValueError: - print("[ERROR] Enter again !") - Input_pi() + else:print("\n[red][ERROR][/red] Please enter correctly");Input_pi() except KeyboardInterrupt: print("\n\nThank you for using Geometry Calc :)") exit() diff --git a/modules/SolidGeometry/Sphere/wannaquit.py b/modules/SolidGeometry/Sphere/wannaquit.py index b760cb1..766c3f9 100644 --- a/modules/SolidGeometry/Sphere/wannaquit.py +++ b/modules/SolidGeometry/Sphere/wannaquit.py @@ -17,7 +17,7 @@ def question(): from modules.SolidGeometry.Sphere.execute import Execute_Sphere Execute_Sphere() elif select == 2: - print("Press [blue][/blue] to continue") + print("Press [magenta][/magenta] to continue") input() elif select == 99: print("\n\nThank you for using Geometry Calc :)")