changed some lines of code in plot method of vtkhandler class to make it more general and fast

Author: fsalmoir

pygem/gui.py

@@ -119,7 +119,12 @@ def _run_simulation(self):
 		new_mesh_points = free_form.modified_mesh_points
 
 		geo_handler.write(new_mesh_points, self.outfilename.get() + file_extension_in)			
-		
+
+		if self.check_var_1.get() == 1:
+			pg.utils.write_bounding_box(params, self.outfilename_lattice_orig.get() + '.vtk', False)
+		if self.check_var_2.get() == 1:
+			pg.utils.write_bounding_box(params, self.outfilename_lattice_mod.get() + '.vtk', True)
+			
 		if file_extension_in in ['.vtk', '.stl', '.iges', '.igs']:
 			figure_in = geo_handler.plot()
 			figure_in.set_size_inches(4, 3)
@@ -128,11 +133,6 @@ def _run_simulation(self):
 			figure_out = geo_handler.plot(self.outfilename.get() + file_extension_in)
 			figure_out.set_size_inches(4, 3)
 			FigureCanvasTkAgg(figure_out, master=self.mod_geo_frame).get_tk_widget().grid(row=1, column=0, padx=5, pady=5)
-
-		if self.check_var_1.get() == 1:
-			pg.utils.write_bounding_box(params, self.outfilename_lattice_orig.get() + '.vtk', False)
-		if self.check_var_2.get() == 1:
-			pg.utils.write_bounding_box(params, self.outfilename_lattice_mod.get() + '.vtk', True)
 
 
 	def _goto_website(self):

pygem/vtkhandler.py

@@ -115,28 +115,23 @@ def plot(self, plot_file=None, save_fig=False):
 		else:
 			self._check_filename_type(plot_file)
 
-		# Read the source file.
-		reader = vtk.vtkUnstructuredGridReader()
+		# Read the source file.		
+		reader = vtk.vtkDataSetReader()
 		reader.SetFileName(plot_file)
 		reader.Update()
 
 		data = reader.GetOutput()
 		points = data.GetPoints()
-		ncells = data.GetCells().GetNumberOfCells()
+		ncells = data.GetNumberOfCells()
 
 		# for each cell it contains the indeces of the points that define the cell
-		cells = np.zeros((ncells, 3))
-
-		for i in range(0, ncells):
-			for j in range(0, 3):
-				cells[i][j] = data.GetCell(i).GetPointId(j)
-
 		figure = plt.figure()
 		axes = a3.Axes3D(figure)
 		vtx = np.zeros((ncells, 3, 3))
 		for i in range(0, ncells):
 			for j in range(0, 3):
-				vtx[i][j][0], vtx[i][j][1], vtx[i][j][2] = points.GetPoint(int(cells[i][j]))
+				cell = data.GetCell(i).GetPointId(j)
+				vtx[i][j][0], vtx[i][j][1], vtx[i][j][2] = points.GetPoint(int(cell))
 			tri = a3.art3d.Poly3DCollection([vtx[i]])
 			tri.set_color('b')
 			tri.set_edgecolor('k')