Changeset 4345 for trunk/GSASIIctrlGUI.py

Timestamp:

Mar 6, 2020 3:05:22 PM (3 years ago)

Author:

toby

Message:

Add more image settings to preferences; prevent save of config.py after "no save"

File:

• trunk/GSASIIctrlGUI.py (modified) (9 diffs)

trunk/GSASIIctrlGUI.py

@@ -1070 +1070 @@
     :param wx.Panel parent: the parent to the :class:`~wxpython.ComboBox` (usually a
       frame or panel)
-    :param dict dct: a dict (or list) to contain the value set
+    :param dct: a dict or list to contain the value set
       for the :class:`~wxpython.ComboBox`.
     :param item: the dict key (or list index) where ``dct[item]`` will 
@@ -1094 +1094 @@
       The default for :data:`values` is to use the same list as
       specified for :data:`choices`.
+    :param function onChange: an optional routine that will be called
+      when the  
+      :class:`~wxpython.ComboBox` can be specified.
     :param (other): additional keyword arguments accepted by
       :class:`~wxpython.ComboBox` can be specified.
     '''
-    def __init__(self,parent,dct,item,choices,values=None,**kw):
+    def __init__(self,parent,dct,item,choices,values=None,OnChange=None,**kw):
         if values is None:
             values = choices
@@ -1113 +1116 @@
         self.dct = dct
         self.item = item
+        self.OnChange = OnChange
         self.Bind(wx.EVT_COMBOBOX, self.onSelection)
     def onSelection(self,event):
@@ -1120 +1124 @@
         else:
             self.dct[self.item] = self.values[0] # unknown
+        if self.OnChange: self.OnChange(event)
 
 ################################################################################
@@ -4707 +4712 @@
     return d
 
+inhibitSave = False
 def SaveConfigVars(vars,parent=None):
     '''Write the current config variable values to config.py
@@ -4716 +4722 @@
     :returns: True if unable to write the file, None otherwise
     '''
+    if inhibitSave:
+        if GSASIIpath.GetConfigValue('debug'):
+            print('inhibitSave prevents saving configuration')
+        return
+
     # try to write to where an old config file is located
     try:
@@ -4878 +4889 @@
         GSASIIpath.SetConfigValue(self.vars)
         self.EndModal(wx.ID_OK)
+        global inhibitSave
+        if event is not None: inhibitSave = True
         import GSASIImpsubs as G2mp
         G2mp.ResetMP()
@@ -4885 +4898 @@
         as the current settings
         '''
+        global inhibitSave
+        inhibitSave = False
         if not SaveConfigVars(self.vars,parent=self):
             self.OnApplyChanges() # force a reload of the config settings
@@ -4963 +4978 @@
                     style=wx.CB_READONLY|wx.CB_DROPDOWN)
                 self.colSel.Bind(wx.EVT_COMBOBOX, OnNewColorBar)
+                self.varsizer.Add(self.colSel, 0, wx.ALIGN_CENTRE|wx.ALL, 5)
+            elif var == 'Image_calibrant':
+                import ImageCalibrants as calFile
+                calList = sorted([m for m in calFile.Calibrants.keys()],
+                                     key=lambda s: s.lower())
+                self.colSel = EnumSelector(self,self.vars[var],1,calList,
+                                               OnChange=self.OnChange)       
                 self.varsizer.Add(self.colSel, 0, wx.ALIGN_CENTRE|wx.ALL, 5)
             else: