From ac7210bd6e4ad04d70cc2f0e651e583f63b03549 Mon Sep 17 00:00:00 2001 From: Lisa Tauxe Date: Wed, 26 Aug 2015 11:01:06 -0700 Subject: [PATCH] modified: thellier_gui.py => fixed add_thelier_gui_criteria bug to add_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' --- thellier_gui.py | 2 +- thellier_gui_dialogs.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/thellier_gui.py b/thellier_gui.py index e41a6ea10..b670a8627 100755 --- a/thellier_gui.py +++ b/thellier_gui.py @@ -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=[] diff --git a/thellier_gui_dialogs.py b/thellier_gui_dialogs.py index d03ca0a4d..4d8ef6a94 100755 --- a/thellier_gui_dialogs.py +++ b/thellier_gui_dialogs.py @@ -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 ) @@ -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: