Skip to content

Commit

Permalink
modified: thellier_gui.py => fixed add_thelier_gui_criteria bug to a…
Browse files Browse the repository at this point in the history
…dd_thellier_gui_criteria in Arai_GUI class

	modified:   thellier_gui_dialogs.py => added default for self.acceptance_criteria['average_by_sample_or_site']['value'])=='site'
  • Loading branch information
ltauxe committed Aug 26, 2015
1 parent dd5f58d commit ac7210b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion thellier_gui.py
Expand Up @@ -2051,7 +2051,7 @@ def on_menu_criteria_file(self, event):
return

self.acceptance_criteria=pmag.initialize_acceptance_criteria()
self.add_thelier_gui_criteria()
self.add_thellier_gui_criteria()
self.read_criteria_file(criteria_file)
# check if some statistics are in the new pmag_criteria_file but not in old. If yes, add to self.preferences['show_statistics_on_gui']
crit_list_not_in_pref=[]
Expand Down
4 changes: 2 additions & 2 deletions thellier_gui_dialogs.py
Expand Up @@ -362,7 +362,7 @@ def InitUI(self):


#---------------------------
# samlpe/site criteria
# sample/site criteria
#---------------------------

bSizer2 = wx.StaticBoxSizer( wx.StaticBox( pnl1, wx.ID_ANY, "sample/Site acceptance criteria" ), wx.HORIZONTAL )
Expand Down Expand Up @@ -538,7 +538,7 @@ def InitUI(self):
#-------------------------------------------
# Intialize values: avearge by site or sample
#-------------------------------------------

if 'average_by_sample_or_site' not in self.acceptance_criteria.keys():self.acceptance_criteria['average_by_sample_or_site']['value']='site'
if str(self.acceptance_criteria['average_by_sample_or_site']['value'])=='site':
self.set_average_by_sample_or_site.SetStringSelection('site')
else:
Expand Down

0 comments on commit ac7210b

Please sign in to comment.