Changeset 4905

Timestamp:

May 17, 2021 9:16:53 PM (2 years ago)

Author:

toby

Message:

fix delete for general; flag constraints where vars are removed

Location:

trunk

Files:

• GSASIIconstrGUI.py (modified) (8 diffs)
• GSASIIrestrGUI.py (modified) (1 diff)

trunk/GSASIIconstrGUI.py

@@ -1078 +1078 @@
             eqString = ['',]
             problemItem = False
+            badVar = False
             for term in item[:-3]:
                 if str(term[1]) in G2mv.problemVars:
@@ -1085 +1086 @@
                 typeString = 'FIXED'
                 var = str(item[0][1])
+                if '?' in var: badVar = True
                 varMean = G2obj.fmtVarDescr(var)
                 eqString[-1] =  var +'   '
@@ -1100 +1102 @@
                     for term in item[:-3]:
                         var = str(term[1])
+                        if '?' in var: badVar = True
                         if len(eqString[-1]) > maxlen:
                             eqString.append(' ')
@@ -1137 +1140 @@
                     for term in item[:-3]:
                         var = str(term[1])
+                        if '?' in var: badVar = True
                         if len(eqString[-1]) > maxlen:
                             eqString.append(' ')
@@ -1158 +1162 @@
                     if item[1][0] == 0: item[1][0] = 1.0
                     var = str(item[0][1])
+                    if '?' in var: badVar = True
                     helptext = 'Variable {:} '.format(var) + " ("+ G2obj.fmtVarDescr(var) + ")"
                     helptext += "\n\nis equivalent to "
@@ -1173 +1178 @@
                     for i,term in enumerate(item[:-3]):
                         var = str(term[1])
+                        if '?' in var: badVar = True
                         if term[0] == 0: term[0] = 1.0
                         if len(eqString[-1]) > maxlen:
@@ -1214 +1220 @@
             constSizer.Add(wx.StaticText(pageDisplay,wx.ID_ANY,typeString),
                            0,WACV|wx.ALIGN_CENTER|wx.RIGHT|wx.LEFT,3)
+            if badVar: eqString[-1] += ' -- Error: variable removed'
             if problemItem: eqString[-1] += ' -- Conflict: see console'
             if len(eqString) > 1:
@@ -1224 +1231 @@
             else:
                 Eq = wx.StaticText(pageDisplay,wx.ID_ANY,eqString[0])
-                if problemItem: Eq.SetBackgroundColour(wx.YELLOW)
+                if problemItem or badVar: Eq.SetBackgroundColour(wx.YELLOW)
             constSizer.Add(Eq,1,WACV)
         return constSizer

trunk/GSASIIrestrGUI.py

@@ -1899 +1899 @@
             '''Delete a restraint expression'''
             n = event.GetEventObject().index
-            G2frame.GetStatusBar().SetStatusText('',1)
-            if not n:
-                G2frame.GetStatusBar().SetStatusText('First select restraints to be deleted',1)
-                return
+            del restrData['General']['General'][n]
             wx.CallAfter(UpdateGeneralRestr,restrData['General'])