scikit-vector-fields 1.0__tar.gz → 1.0.4__tar.gz

{scikit_vector_fields-1.0/src/scikit_vector_fields.egg-info → scikit_vector_fields-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scikit-vector-fields
-Version: 1.0
+Version: 1.0.4
 Summary: A package to perform vector field computations
 Author-email: Sarang Pendharker <sarang@ece.iitkgp.ac.in>
 Project-URL: Homepage, https://github.com/sarang-IITKgp/scikit-vector-fields
@@ -15,11 +15,8 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: matplotlib
-Requires-Dist: mayavi
-Requires-Dist: PyQt5
 Requires-Dist: pandas
 Requires-Dist: regex
-Requires-Dist: os-sys
 Dynamic: license-file
 
 # scikit-vector-fields

{scikit_vector_fields-1.0 → scikit_vector_fields-1.0.4}/pyproject.toml

@@ -1,11 +1,11 @@
 [build-system]
-requires = ["setuptools>=40.8.0","numpy","matplotlib","PyQt5","pandas","regex"]
+requires = ["setuptools>=40.8.0","numpy","matplotlib","pandas","regex"]
 build-backend = "setuptools.build_meta"
 
 
 [project]
 name = "scikit-vector-fields"
-version = "1.0"
+version = "1.0.4"
 authors = [
   { name="Sarang Pendharker", email="sarang@ece.iitkgp.ac.in" },
 ]
@@ -20,7 +20,7 @@ classifiers = [
     "Topic :: Scientific/Engineering"
 ]
 
-dependencies = ["numpy","matplotlib","mayavi","PyQt5","pandas","regex","os-sys"]
+dependencies = ["numpy","matplotlib","pandas","regex"]
 
 [project.urls]
 "Homepage" = "https://github.com/sarang-IITKgp/scikit-vector-fields"

{scikit_vector_fields-1.0 → scikit_vector_fields-1.0.4/src/scikit_vector_fields.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scikit-vector-fields
-Version: 1.0
+Version: 1.0.4
 Summary: A package to perform vector field computations
 Author-email: Sarang Pendharker <sarang@ece.iitkgp.ac.in>
 Project-URL: Homepage, https://github.com/sarang-IITKgp/scikit-vector-fields
@@ -15,11 +15,8 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: matplotlib
-Requires-Dist: mayavi
-Requires-Dist: PyQt5
 Requires-Dist: pandas
 Requires-Dist: regex
-Requires-Dist: os-sys
 Dynamic: license-file
 
 # scikit-vector-fields

{scikit_vector_fields-1.0 → scikit_vector_fields-1.0.4}/src/scikit_vector_fields.egg-info/requires.txt

@@ -1,7 +1,4 @@
 numpy
 matplotlib
-mayavi
-PyQt5
 pandas
 regex
-os-sys

{scikit_vector_fields-1.0 → scikit_vector_fields-1.0.4}/src/skvf/__init__.py

@@ -4,7 +4,7 @@ import skvf.plot
 import skvf.data
 
 
-__version__ = '1.0'
+__version__ = '1.0.4'
 
 
 EPSILON_0 = 8.8541878128e-12 # F/m

{scikit_vector_fields-1.0 → scikit_vector_fields-1.0.4}/src/skvf/data.py

@@ -12,7 +12,7 @@ import mayavi.mlab as mlab
 
 # import sys as sys
 
-from os.path import dirname, realpath
+# from os.path import dirname, realpath
 import sys
 
 
@@ -35,11 +35,11 @@ def get_text_between_strings_regex(main_string, start_pattern, end_pattern=None)
 		return match.group(1)
 	return None
 
-def load_HFSS_field_file(filename,text_tag=None):
+def load_HFSS_field_file(fullname,text_tag=None):
 	'''Exported file contains following data columns:
 	 Z, Y, Freq, X, F_total, Fx, Fy, Fz''' 
-	path=dirname(realpath(sys.argv[0])) ## get path of the current directory.
-	fullname = path+'/'+filename
+	# path=dirname(realpath(sys.argv[0])) ## get path of the current directory.
+	# fullname = path+'/'+filename
 	
 	df = pd.read_csv(fullname)
 	print('Loading file: ',fullname, 'as data frame')

{scikit_vector_fields-1.0 → scikit_vector_fields-1.0.4}/src/skvf/entities.py

@@ -483,13 +483,18 @@ class field():
 
 	def TH_at_t(self,omega,t):
 		'''Return the field after harmonically evolving for 't' time with 'omega' frequency'''
-		Fx = self.field.x*np.exp(1j*omega*t)
-		Fy = self.field.y*np.exp(1j*omega*t)
-		Fz = self.field.z*np.exp(1j*omega*t)
+		
+		if self.field_type == 'vector':
+			Fx = self.field.x*np.exp(1j*omega*t)
+			Fy = self.field.y*np.exp(1j*omega*t)
+			Fz = self.field.z*np.exp(1j*omega*t)
 
-		F_vec_t = vector(Fx,Fy,Fz)
+			F_vec_t = vector(Fx,Fy,Fz)
 
-		return field(F_vec_t,self.space,text_tag=self.text_tag+'*exp(j '+str(omega)+'*'+str(t)+')')
+			return field(F_vec_t,self.space,text_tag=self.text_tag+'*exp(j '+str(omega)+'*'+str(t)+')')
+		if self.field_type == 'scalar':
+			F_scalar_t = self.field*np.exp(1j*omega*t)
+			return field(F_scalar_t,self.space,text_tag=self.text_tag+'*exp(j '+str(omega)+'*'+str(t)+')')
 
 
 
@@ -609,7 +614,7 @@ class field():
 		return ax, Fig
 		
 		
-	def plot_quiver3d(self,Fig=None,arrow_density = 0.7,text_tag=None,scale_mode='none',colormap='jet'):
+	def plot_quiver3d(self,Fig=None,arrow_density = 0.7,text_tag=None,scale_mode='none',cmap='jet'):
 		
 		if text_tag == None:
 			text_tag = self.text_tag
@@ -618,7 +623,7 @@ class field():
 			
 				
 		print('Plotting 3D quiver plot of: '+text_tag)
-		handle_s, Fig = plot.quiver3d(self.space,self.field,arrow_density=arrow_density,text_tag=text_tag,scale_mode=scale_mode,Fig=Fig,colormap=colormap)
+		handle_s, Fig = plot.quiver3d(self.space,self.field,arrow_density=arrow_density,text_tag=text_tag,scale_mode=scale_mode,Fig=Fig,cmap=cmap)
 		
 		return handle_s, Fig
 		

{scikit_vector_fields-1.0 → scikit_vector_fields-1.0.4}/src/skvf/plot.py

@@ -2,7 +2,7 @@ import numpy as np
 """Plot commands"""
 import matplotlib.pyplot as plt
 
-import mayavi.mlab as mlab
+
 import sys as sys
 
 
@@ -296,125 +296,171 @@ def contourf(space,scalar,plane=None,loc=0,ax=None,Fig=None,color=True,cmap='jet
 	return ax, Fig
 	 
 	
-def quiver3d(space,vector,arrow_density = 0.7,text_tag=None,scale_mode='none',Fig=None,colormap='jet'):
+def quiver3d(space,vector,arrow_density = 0.5,text_tag=None,scale_mode=True,ax=None,Fig=None,color=True,cmap='jet',vmax=None,vmin=None,flag_colorbar=True):
 	
 	if text_tag == None:
 		text_tag = vector.text_tag
 	
-	if Fig == None:
-		Fig = mlab.figure('Mayavi plot: '+text_tag)
-	else:
-		mlab.figure(Fig)
+	if ax == None:
+		if Fig == None:
+			Fig = plt.figure(text_tag)
+		
+		ax = Fig.add_subplot(111,projection='3d')
+	
+	
+	# mask_points=int(max([pts_x,pts_y,pts_z])*(1.1-arrow_density))
+	
+	
 	
 	
 	if space.plane == 'x-y-z-3D':
 		pts_y,pts_x,pts_z = space.shape
 					
-		print('Plotting 3D quiver plot of '+text_tag+' using mayavi')
+		print('Plotting 3D quiver plot of '+text_tag+' Matplotlib')
+		
+		mask_points = int(1/arrow_density)
+		
+		
+		
+		x_grid_masked = space.x_grid[0:pts_y:mask_points,0:pts_x:mask_points,0:pts_z:mask_points]
+		y_grid_masked = space.y_grid[0:pts_y:mask_points,0:pts_x:mask_points,0:pts_z:mask_points]
+		z_grid_masked = space.z_grid[0:pts_y:mask_points,0:pts_x:mask_points,0:pts_z:mask_points]
+		
+		
+		vectror_x_grid_masked = vector.x[0:pts_y:mask_points,0:pts_x:mask_points,0:pts_z:mask_points]
+		vectror_y_grid_masked = vector.y[0:pts_y:mask_points,0:pts_x:mask_points,0:pts_z:mask_points]
+		vectror_z_grid_masked = vector.z[0:pts_y:mask_points,0:pts_x:mask_points,0:pts_z:mask_points]
+		
 		
-		handle_s = mlab.quiver3d(space.x_grid,space.y_grid,space.z_grid, vector.x,vector.y,vector.z,scale_mode=scale_mode,mask_points=int(max([pts_x,pts_y,pts_z])*(1.1-arrow_density)),figure=Fig,colormap=colormap)
+		
+		if color == True:
+			ax.quiver(x_grid_masked, y_grid_masked, z_grid_masked, vectror_x_grid_masked, vectror_y_grid_masked, vectror_y_grid_masked, length=0.1, normalize=True,cmap=cmap)	
+		else:
+			ax.quiver(x_grid_masked, y_grid_masked, z_grid_masked, vectror_x_grid_masked, vectror_y_grid_masked, vectror_y_grid_masked, length=0.1, normalize=True)	
+			# ax.quiver(var1,var2,data1,data2,pivot='mid')
+		# ax.set_aspect('equal')
+		# ax.set_xlabel(xlabel)
+		# ax.set_ylabel(ylabel)
+		
+		# ax.quiver(space.x_grid, space.y_grid, space.z_grid, vector.x, vector.y, vector.z, length=0.1, normalize=True)
+		# handle_s = mlab.quiver3d(space.x_grid,space.y_grid,space.z_grid, vector.x,vector.y,vector.z,scale_mode=scale_mode,mask_points=int(max([pts_x,pts_y,pts_z])*(1.1-arrow_density)),figure=Fig,colormap=colormap)
 
-		mlab.outline()
-		mlab.orientation_axes()
-		mlab.axes()
+		# mlab.outline()
+		# mlab.orientation_axes()
+		# mlab.axes()
 		
 	else:
 		sys.exit('only 3D vector fields can be plotted using this command.')
-	return handle_s, mlab.gcf()
+	# return handle_s, mlab.gcf()
+	return ax, Fig
 	
 def volume_slice_scalar(scalar,Fig=None,colormap='jet',text_tag='scalar field'):
 	
 	
-	if Fig ==  None:
-		Fig = mlab.figure('Mayavi volume slice plot:'+text_tag)
-	else:
-		mlab.figure(Fig)
+	# if Fig ==  None:
+		# Fig = mlab.figure('Mayavi volume slice plot:'+text_tag)
+	# else:
+		# mlab.figure(Fig)
 		
-	mlab.volume_slice(np.transpose(scalar,axes=[1,0,2]),figure=Fig,plane_orientation='x_axes')
-	mlab.volume_slice(np.transpose(scalar,axes=[1,0,2]),figure=Fig,plane_orientation='y_axes')
-	mlab.volume_slice(np.transpose(scalar,axes=[1,0,2]),figure=Fig,plane_orientation='z_axes')
+	# mlab.volume_slice(np.transpose(scalar,axes=[1,0,2]),figure=Fig,plane_orientation='x_axes')
+	# mlab.volume_slice(np.transpose(scalar,axes=[1,0,2]),figure=Fig,plane_orientation='y_axes')
+	# mlab.volume_slice(np.transpose(scalar,axes=[1,0,2]),figure=Fig,plane_orientation='z_axes')
 		
-	mlab.contour3d(np.transpose(scalar,axes=[1,0,2]),figure=Fig)
+	# mlab.contour3d(np.transpose(scalar,axes=[1,0,2]),figure=Fig)
 	
-	mlab.outline()
-	mlab.orientation_axes()
-	mlab.axes()
+	# mlab.outline()
+	# mlab.orientation_axes()
+	# mlab.axes()
 	
-	return mlab.gcf()
+	print('VERSION UPDATE WARNING: VOLUME SLICE 3D PLOT BASED ON MAYAVI LIBRARY AS BEEN DISCONTINUED. PLEASE USE ALTERNATE PLOT COMMAND.')
+	
+	return Fig
 
 	
 def volume_slice_vector(vector,Fig=None,colormap='jet',text_tag='vector field',arrow_density = 0.7,normal_plot=False):
 	
-	pts_y,pts_x,pts_z = vector.x.shape
+	# pts_y,pts_x,pts_z = vector.x.shape
 	
-	if Fig ==  None:
-		Fig = mlab.figure('Mayavi volume slice plot:'+text_tag)
-	else:
-		mlab.figure(Fig)
+	# if Fig ==  None:
+		# Fig = mlab.figure('Mayavi volume slice plot:'+text_tag)
+	# else:
+		# mlab.figure(Fig)
 	
 	
 	
 	
-	if normal_plot == True:
-		scalar_x_axes = vector.x #np.sqrt(vector.y**2 + vector.z**2)
-		scalar_y_axes = vector.y #np.sqrt(vector.x**2 + vector.z**2)
-		scalar_z_axes = vector.z #np.sqrt(vector.x**2 + vector.y**2)
-		print('Control here')
-	else:
+	# if normal_plot == True:
+		# scalar_x_axes = vector.x #np.sqrt(vector.y**2 + vector.z**2)
+		# scalar_y_axes = vector.y #np.sqrt(vector.x**2 + vector.z**2)
+		# scalar_z_axes = vector.z #np.sqrt(vector.x**2 + vector.y**2)
+		# print('Control here')
+	# else:
 		
-		scalar_x_axes = np.sqrt(vector.y**2 + vector.z**2)
-		scalar_y_axes = np.sqrt(vector.x**2 + vector.z**2)
-		scalar_z_axes = np.sqrt(vector.x**2 + vector.y**2)
+		# scalar_x_axes = np.sqrt(vector.y**2 + vector.z**2)
+		# scalar_y_axes = np.sqrt(vector.x**2 + vector.z**2)
+		# scalar_z_axes = np.sqrt(vector.x**2 + vector.y**2)
 	
-	mlab.volume_slice(np.transpose(scalar_x_axes,axes=[1,0,2]), plane_orientation='x_axes',colormap=colormap)
-	mlab.volume_slice(np.transpose(scalar_y_axes,axes=[1,0,2]), plane_orientation='y_axes',colormap=colormap)
-	mlab.volume_slice(np.transpose(scalar_z_axes,axes=[1,0,2]), plane_orientation='z_axes',colormap=colormap)
+	# mlab.volume_slice(np.transpose(scalar_x_axes,axes=[1,0,2]), plane_orientation='x_axes',colormap=colormap)
+	# mlab.volume_slice(np.transpose(scalar_y_axes,axes=[1,0,2]), plane_orientation='y_axes',colormap=colormap)
+	# mlab.volume_slice(np.transpose(scalar_z_axes,axes=[1,0,2]), plane_orientation='z_axes',colormap=colormap)
 
-	obj = mlab.quiver3d(np.transpose(vector.x,axes=[1,0,2]),np.transpose(vector.y,axes=[1,0,2]),np.transpose(vector.z,axes=[1,0,2]),scale_mode='none',mask_points=int(max([pts_x,pts_y,pts_z])*(1.1-arrow_density)))
+	# obj = mlab.quiver3d(np.transpose(vector.x,axes=[1,0,2]),np.transpose(vector.y,axes=[1,0,2]),np.transpose(vector.z,axes=[1,0,2]),scale_mode='none',mask_points=int(max([pts_x,pts_y,pts_z])*(1.1-arrow_density)))
 
-	mlab.outline()
-	mlab.orientation_axes()
-	mlab.axes()
+	# mlab.outline()
+	# mlab.orientation_axes()
+	# mlab.axes()
+	
+	
+	print('VERSION UPDATE WARNING: VOLUME SLICE 3D PLOT BASED ON MAYAVI LIBRARY AS BEEN DISCONTINUED. PLEASE USE ALTERNATE PLOT COMMAND.')
+	
 		
-	return mlab.gcf()
+	return Fig
 
 
 def contour3d(space,scalar,Fig=None,colormap='jet',text_tag='field',contours=None):
-	if Fig ==  None:
-		Fig = mlab.figure('Mayavi contour3d plot:'+text_tag)
-	else:
-		mlab.figure(Fig)
+	# if Fig ==  None:
+		# Fig = mlab.figure('Mayavi contour3d plot:'+text_tag)
+	# else:
+		# mlab.figure(Fig)
 
 
-	if contours == None:
-		mlab.contour3d(np.transpose(space.x_grid,axes=[1,0,2]),np.transpose(space.y_grid,axes=[1,0,2]),np.transpose(space.z_grid,axes=[1,0,2]),np.transpose(scalar,axes=[1,0,2]),figure=Fig)
-	else:	
-		mlab.contour3d(np.transpose(space.x_grid,axes=[1,0,2]),np.transpose(space.y_grid,axes=[1,0,2]),np.transpose(space.z_grid,axes=[1,0,2]),np.transpose(scalar,axes=[1,0,2]),figure=Fig,contours=contours)
-	mlab.outline()
-	mlab.orientation_axes()
-	mlab.axes()
+	# if contours == None:
+		# mlab.contour3d(np.transpose(space.x_grid,axes=[1,0,2]),np.transpose(space.y_grid,axes=[1,0,2]),np.transpose(space.z_grid,axes=[1,0,2]),np.transpose(scalar,axes=[1,0,2]),figure=Fig)
+	# else:	
+		# mlab.contour3d(np.transpose(space.x_grid,axes=[1,0,2]),np.transpose(space.y_grid,axes=[1,0,2]),np.transpose(space.z_grid,axes=[1,0,2]),np.transpose(scalar,axes=[1,0,2]),figure=Fig,contours=contours)
+	# mlab.outline()
+	# mlab.orientation_axes()
+	# mlab.axes()
+	
 	
-	return mlab.gcf()
+	print('VERSION UPDATE WARNING: Contour3D PLOT BASED ON MAYAVI LIBRARY AS BEEN DISCONTINUED. PLEASE USE ALTERNATE PLOT COMMAND.')
+	
+	return Fig
 	
 	
 
 def plot_mayavi_quiver(F_field,figure,scale_mode='none',arrow_density=0.7,colormap='jet',line_width=2):
 	
-	pts_y,pts_x,pts_z = F_field.space.x_grid.shape
+	# pts_y,pts_x,pts_z = F_field.space.x_grid.shape
+	
+	# sq = mlab.quiver3d(F_field.space.x_grid,F_field.space.y_grid,F_field.space.z_grid, F_field.field.x,F_field.field.y,F_field.field.z,scale_mode=scale_mode,mask_points=int(max([pts_x,pts_y,pts_z])*(1.1-arrow_density)),figure=figure,colormap=colormap,line_width=line_width)
 	
-	sq = mlab.quiver3d(F_field.space.x_grid,F_field.space.y_grid,F_field.space.z_grid, F_field.field.x,F_field.field.y,F_field.field.z,scale_mode=scale_mode,mask_points=int(max([pts_x,pts_y,pts_z])*(1.1-arrow_density)),figure=figure,colormap=colormap,line_width=line_width)
-	return sq
+	print('VERSION UPDATE WARNING: Quiver 3D PLOT BASED ON MAYAVI LIBRARY AS BEEN DISCONTINUED. PLEASE USE ALTERNATE PLOT COMMAND.')
+	
+	return figure
 
 
 def plot_mayavi_points3d(F_field,figure,scale_mode='scalar',point_density=1,colormap='jet',opacity=0.2,vmax=None,vmin=None):
-	if vmax == None:
-		vmax = np.max(F_field.real().field)
+	# if vmax == None:
+		# vmax = np.max(F_field.real().field)
 		
-	if vmin == None:
-		vmin = np.min(F_field.real().field)
+	# if vmin == None:
+		# vmin = np.min(F_field.real().field)
 		
-	pts_y,pts_x,pts_z = F_field.space.x_grid.shape
+	# pts_y,pts_x,pts_z = F_field.space.x_grid.shape
+	
+	# s = mlab.points3d(F_field.space.x_grid,F_field.space.y_grid,F_field.space.z_grid, F_field.field,scale_mode=scale_mode,mask_points=int(max([pts_x,pts_y,pts_z])*(1.1-point_density)),figure=figure,colormap=colormap,vmax=vmax,vmin=vmin,opacity=opacity,scale_factor=0.05)
 	
-	s = mlab.points3d(F_field.space.x_grid,F_field.space.y_grid,F_field.space.z_grid, F_field.field,scale_mode=scale_mode,mask_points=int(max([pts_x,pts_y,pts_z])*(1.1-point_density)),figure=figure,colormap=colormap,vmax=vmax,vmin=vmin,opacity=opacity,scale_factor=0.05)
+	print('VERSION UPDATE WARNING: 3D Point PLOT BASED ON MAYAVI LIBRARY AS BEEN DISCONTINUED. PLEASE USE ALTERNATE PLOT COMMAND.')
 	
 	return s