Changeset 1861

Timestamp:

May 19, 2015 11:59:25 AM (8 years ago)

Author:

vondreele

Message:

fix missing data error messages

Location:

trunk

Files:

• GSASII.py (modified) (2 diffs)
• GSASIIstrIO.py (modified) (1 diff)

trunk/GSASII.py

@@ -3487 +3487 @@
         errmsg, warnmsg = G2stIO.ReadCheckConstraints(self.GSASprojectfile)
         if errmsg:
-            self.ErrorDialog('Constraint Error',
-                             'Error in constraints. Refinement not possible.'+
-                             '\nSee console error message for details.')
+            self.ErrorDialog('Refinement error',errmsg)
             return
         if warnmsg:
             print('Conflict between refinment flag settings and constraints:\n'+
-                  warnmsg+'\nRefinement not possible')
+                warnmsg+'\nRefinement not possible')
             self.ErrorDialog('Refinement Flag Error',
-                             'Conflict between refinement flag settings and constraints:\n'+
-                             warnmsg+
-                             '\nRefinement not possible')
+                'Conflict between refinement flag settings and constraints:\n'+
+                warnmsg+'\nRefinement not possible')
             return
         dlg = wx.ProgressDialog('Residual','All data Rw =',101.0, 
@@ -3570 +3567 @@
         errmsg, warnmsg = G2stIO.ReadCheckConstraints(self.GSASprojectfile)
         if errmsg:
-            self.ErrorDialog('Constraint Error',
-                             'Error in constraints:\n'+errmsg+
-                             '\nRefinement not possible')
+            self.ErrorDialog('Refinement error',errmsg)
             return
         if warnmsg:

trunk/GSASIIstrIO.py

@@ -183 +183 @@
     Histograms,Phases = GetUsedHistogramsAndPhases(GPXfile)
     if not Phases:
-        return 'Error: No Phases!',''
+        return 'Error: No phases or no histograms in phases!',''
     if not Histograms:
         return 'Error: no diffraction data',''