Merge pull request #82 from fsalmoir/plot_geo_gui

now we can plot iges, vtk and stl on the gui during the execution

Author: fsalmoir

pygem/gui.py

@@ -12,6 +12,10 @@
 import os
 import webbrowser
 
+from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg
+from matplotlib.figure import Figure
+
+
 class Gui(object):
 	"""
 	The class for the Graphic Unit Interface.
@@ -32,12 +36,19 @@ class Gui(object):
 	:cvar Tkinter.Label label_geo: label related to 'print_geometry_path'.
 	:cvar Tkinter.Label label_params: label related to 'print_parameters_path'.
 	:cvar string url: url of the github page of PyGeM.
+	:cvar Tkinter.Canvas logo_panel: canvas for PyGeM logo.
+	:cvar Tkinter.PhotoImage img: PyGeM logo.
+	:cvar Tkinter.Frame orig_geo_frame: frame for plotting of the original geometry.
+	:cvar Tkinter.Frame mod_geo_frame: frame for plotting of the final geometry.
 	
 	"""
 
 	def __init__(self):
 
 		self.root = Tkinter.Tk()
+		self.root.resizable(width=False, height=False)
+		self.root.minsize(width=1400, height=400)
+		self.root.maxsize(width=1400, height=400)
 		self.root.title('PyGeM')
 
 		self.filename_geometry = Tkinter.StringVar()
@@ -52,10 +63,10 @@ def __init__(self):
 		self.label_geo = None
 		self.label_params = None
 		self.url = 'https://github.com/mathLab/PyGeM'
-		
-		self.canvas = None
+		self.logo_panel = None
 		self.img = None
-		
+		self.orig_geo_frame = None
+		self.mod_geo_frame = None
 
 
 	def _chose_geometry(self):
@@ -107,7 +118,16 @@ def _run_simulation(self):
 		free_form.perform()
 		new_mesh_points = free_form.modified_mesh_points
 
-		geo_handler.write(new_mesh_points, self.outfilename.get() + file_extension_in)
+		geo_handler.write(new_mesh_points, self.outfilename.get() + file_extension_in)			
+		
+		if file_extension_in in ['.vtk', '.stl', '.iges', '.igs']:
+			figure_in = geo_handler.plot()
+			figure_in.set_size_inches(4, 3)
+			FigureCanvasTkAgg(figure_in, master=self.orig_geo_frame).get_tk_widget().grid(row=1, column=0, padx=5, pady=5)
+		
+			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)
@@ -129,12 +149,23 @@ def main(self):
 		"""
 
 		self.logo_panel = Tkinter.Canvas(self.root, height=60 , width=60)
-		self.logo_panel.pack(side = "bottom", padx = 5, pady = 5,anchor=Tkinter.SE)
+		self.logo_panel.pack(side="bottom", padx=5, pady=5,anchor=Tkinter.SE)
 		self.img = Tkinter.PhotoImage(master=self.logo_panel, file='readme/logo_PyGeM_gui.gif')
 		self.logo_panel.create_image(35,35, image=self.img)
 
-		code_frame = Tkinter.Frame(self.root)
-		code_frame.pack()
+		self.orig_geo_frame = Tkinter.Frame(self.root, height=450, width=360, bg='#c1d0f0')
+		self.orig_geo_frame.pack(side="left", padx=5, pady=5)
+		self.orig_geo_frame.pack_propagate(0)
+		Tkinter.Label(self.orig_geo_frame, text="INPUT GEOMETRY", bg='#c1d0f0', font=("Arial", 20)).grid(row=0, column=0, padx=3, pady=3)
+		
+		self.mod_geo_frame = Tkinter.Frame(self.root, height=450, width=360, bg='#80ff80', padx=5, pady=5)
+		self.mod_geo_frame.pack(side="right", padx=5, pady=5)
+		self.mod_geo_frame.pack_propagate(0)
+		Tkinter.Label(self.mod_geo_frame, text="OUTPUT GEOMETRY", bg='#80ff80', font=("Arial", 20)).grid(row=0, column=0, padx=3, pady=3)
+		
+		code_frame = Tkinter.Frame(self.root, height=490, width=360, relief=Tkinter.GROOVE, borderwidth=1)
+		code_frame.pack(padx=5, pady=5)
+		code_frame.pack_propagate(0)
 
 		# Buttons 1
 		Tkinter.Button(code_frame, text ="Pick the geometry", command = self._chose_geometry).grid(row=0, column=0, padx=3, pady=3)
@@ -164,7 +195,8 @@ def main(self):
 		Tkinter.Entry(code_frame, bd =5, textvariable=self.outfilename_lattice_mod).grid(row=4, column=1)
 
 		# Run button
-		Tkinter.Button(code_frame, text ="Run PyGeM", command = self._run_simulation, bg='#065893', fg='#f19625', font='bold').grid(row=5, column=0, padx=3, pady=3)
+		Tkinter.Button(code_frame, text ="Run PyGeM", command = self._run_simulation, bg='#065893', fg='#f19625', \
+						 font='bold').grid(row=5, column=0, columnspan=2, padx=3, pady=3)
 
 		# Menu
 		menubar = Tkinter.Menu(self.root)

pygem/igeshandler.py

@@ -219,6 +219,9 @@ def plot(self, plot_file=None, save_fig=False):
 		:param string plot_file: the iges filename you want to plot.
 		:param bool save_fig: a flag to save the figure in png or not. If True the
 			plot is not shown.
+			
+		:return: figure: matlplotlib structure for the figure of the chosen geometry
+		:rtype: matplotlib.pyplot.figure
 		"""
 		if plot_file is None:
 			plot_file = self.infile
@@ -254,6 +257,8 @@ def plot(self, plot_file=None, save_fig=False):
 			pyplot.show()
 		else:
 			figure.savefig(plot_file.split('.')[0] + '.png')
+			
+		return figure
 
 
 	def show(self, show_file=None):

pygem/stlhandler.py

@@ -87,6 +87,9 @@ def plot(self, plot_file=None, save_fig=False):
 		:param string plot_file: the stl filename you want to plot.
 		:param bool save_fig: a flag to save the figure in png or not. If True the
 			plot is not shown.
+			
+		:return: figure: matlplotlib structure for the figure of the chosen geometry
+		:rtype: matplotlib.pyplot.figure
 		"""
 		if plot_file is None:
 			plot_file = self.infile
@@ -110,3 +113,6 @@ def plot(self, plot_file=None, save_fig=False):
 			pyplot.show()
 		else:
 			figure.savefig(plot_file.split('.')[0] + '.png')
+			
+		return figure	
+		

pygem/vtkhandler.py

@@ -106,6 +106,9 @@ def plot(self, plot_file=None, save_fig=False):
 		:param string plot_file: the vtk filename you want to plot.
 		:param bool save_fig: a flag to save the figure in png or not. If True the
 			plot is not shown.
+			
+		:return: figure: matlplotlib structure for the figure of the chosen geometry
+		:rtype: matplotlib.pyplot.figure
 		"""
 		if plot_file is None:
 			plot_file = self.infile
@@ -147,6 +150,8 @@ def plot(self, plot_file=None, save_fig=False):
 			plt.show()
 		else:
 			figure.savefig(plot_file.split('.')[0] + '.png')
+			
+		return figure
 
 
 	def show(self, show_file=None):

readme/gui_PyGeM.png

@@ -70,6 +70,26 @@ def test_gui_init_none_2(self):
 		gui_handler = gui.Gui()
 		assert gui_handler.label_params == None
 
+	
+	def test_gui_init_none_3(self):
+		gui_handler = gui.Gui()
+		assert gui_handler.logo_panel == None
+		
+		
+	def test_gui_init_none_4(self):
+		gui_handler = gui.Gui()
+		assert gui_handler.img == None
+		
+		
+	def test_gui_init_none_5(self):
+		gui_handler = gui.Gui()
+		assert gui_handler.orig_geo_frame == None
+		
+		
+	def test_gui_init_none_6(self):
+		gui_handler = gui.Gui()
+		assert gui_handler.mod_geo_frame == None
+		
 
 	def test_gui_init_all(self):
 		gui.Gui()