Move points generation into datatype classes

Author: vitcpp

datatypes/great_circle_arc.py

@@ -1,4 +1,6 @@
+import numpy as np
 from .point import Point
+from .vector import Vector
 
 class GreatCircleArc:
 
@@ -7,3 +9,15 @@ def __init__(self, beg : Point, end : Point):
 
 	def __getitem__(self, idx):
 		return self.pts[idx]
+
+	def points(self, num : int):
+		v1 = Vector(self[0])
+		v2 = Vector(self[1])
+		v3 = v1.cross_product(v2)
+		v4 = v3.cross_product(v2).normalized()
+		dp = -np.arccos(v1.dot_product(v2))
+		t = np.linspace(0, dp, 1000)
+		x = np.cos(t) * v2[0] + np.sin(t) * v4[0]
+		y = np.cos(t) * v2[1] + np.sin(t) * v4[1]
+		z = np.cos(t) * v2[2] + np.sin(t) * v4[2]
+		return x, y, z

datatypes/meridian.py

@@ -1,6 +1,15 @@
+import numpy as np
 from .point import Point
 
 class Meridian:
 
-	def __init__(self, lng):
+	def __init__(self, lng : float):
 		self.lng = lng
+
+	def points(self, num : int):
+		lngv = self.lng
+		latv = np.linspace(-np.pi/2, np.pi/2, num)
+		x = np.cos(lngv) * np.cos(latv)
+		y = np.sin(lngv) * np.cos(latv)
+		z = np.sin(latv)
+		return x, y, z

datatypes/parallel.py

@@ -1,6 +1,15 @@
+import numpy as np
 from .point import Point
 
 class Parallel:
 
 	def __init__(self, lat):
 		self.lat = lat
+
+	def points(self, num : int):
+		lngv = np.linspace(0, 2 * np.pi, num)
+		latv = self.lat
+		x = np.cos(lngv) * np.cos(latv)
+		y = np.sin(lngv) * np.cos(latv)
+		z = np.sin(latv)
+		return x, y, z

datatypes/vector.py

@@ -32,3 +32,9 @@ def normalized(self):
 		norm = np.sqrt(self[0] ** 2 + self[1] ** 2 + self[2] ** 2)
 		coords = self.coords / norm
 		return Vector(coords)
+
+	def points(self, num : int):
+		x = np.linspace(0, self[0], num)
+		y = np.linspace(0, self[1], num)
+		z = np.linspace(0, self[2], num)
+		return x, y, z

sphereplot.py

@@ -63,36 +63,18 @@ def __plot_object(self, gobj):
 			self.__plot_vector(gobj)
 
 	def __plot_meridian(self, gobj, **kwargs):
-		lngv = gobj.lng
-		latv = np.linspace(-np.pi/2, np.pi/2, 100)
-		x = np.cos(lngv) * np.cos(latv)
-		y = np.sin(lngv) * np.cos(latv)
-		z = np.sin(latv)
+		x, y, z = gobj.points(100)
 		self.axes.scatter(x, y, z, **kwargs)
 
 	def __plot_parallel(self, gobj):
-		lngv = np.linspace(0, 2 * np.pi, 100)
-		latv = gobj.lat
-		x = np.cos(lngv) * np.cos(latv)
-		y = np.sin(lngv) * np.cos(latv)
-		z = np.sin(latv)
+		x, y, z = gobj.points(200)
 		self.axes.scatter(x, y, z, s = 0.1, color = "darkgray")
 
 	def __plot_arc(self, garc, **kwargs):
-		v1 = Vector(garc[0])
-		v2 = Vector(garc[1])
-		v3 = v1.cross_product(v2)
-		v4 = v3.cross_product(v2).normalized()
-		dp = -np.arccos(v1.dot_product(v2))
-		t = np.linspace(0, dp, 1000)
-		x = np.cos(t) * v2[0] + np.sin(t) * v4[0]
-		y = np.cos(t) * v2[1] + np.sin(t) * v4[1]
-		z = np.cos(t) * v2[2] + np.sin(t) * v4[2]
+		x, y, z = garc.points(100)
 		k = { "color" : "red", "s" : 0.1 } | kwargs
 		self.axes.scatter(x, y, z, **k)
 
 	def __plot_vector(self, gvec : Vector, **kwargs):
-		x = np.linspace(0, gvec[0], 100)
-		y = np.linspace(0, gvec[1], 100)
-		z = np.linspace(0, gvec[2], 100)
+		x, y, z = gvec.points(2)
 		self.axes.plot3D(x, y, z, **kwargs)