Changeset 1861 for trunk/GSASII.py


Ignore:
Timestamp:
May 19, 2015 11:59:25 AM (7 years ago)
Author:
vondreele
Message:

fix missing data error messages

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r1838 r1861  
    34873487        errmsg, warnmsg = G2stIO.ReadCheckConstraints(self.GSASprojectfile)
    34883488        if errmsg:
    3489             self.ErrorDialog('Constraint Error',
    3490                              'Error in constraints. Refinement not possible.'+
    3491                              '\nSee console error message for details.')
     3489            self.ErrorDialog('Refinement error',errmsg)
    34923490            return
    34933491        if warnmsg:
    34943492            print('Conflict between refinment flag settings and constraints:\n'+
    3495                   warnmsg+'\nRefinement not possible')
     3493                warnmsg+'\nRefinement not possible')
    34963494            self.ErrorDialog('Refinement Flag Error',
    3497                              'Conflict between refinement flag settings and constraints:\n'+
    3498                              warnmsg+
    3499                              '\nRefinement not possible')
     3495                'Conflict between refinement flag settings and constraints:\n'+
     3496                warnmsg+'\nRefinement not possible')
    35003497            return
    35013498        dlg = wx.ProgressDialog('Residual','All data Rw =',101.0,
     
    35703567        errmsg, warnmsg = G2stIO.ReadCheckConstraints(self.GSASprojectfile)
    35713568        if errmsg:
    3572             self.ErrorDialog('Constraint Error',
    3573                              'Error in constraints:\n'+errmsg+
    3574                              '\nRefinement not possible')
     3569            self.ErrorDialog('Refinement error',errmsg)
    35753570            return
    35763571        if warnmsg:
Note: See TracChangeset for help on using the changeset viewer.